* [gentoo-commits] dev/dev-zero:master commit in: dev-python/future/files/, dev-python/future/, dev-python/whichcraft/, ...
@ 2016-03-09 8:40 Tiziano Müller
0 siblings, 0 replies; only message in thread
From: Tiziano Müller @ 2016-03-09 8:40 UTC (permalink / raw
To: gentoo-commits
commit: dd846716dab69a441f17a5553b3402c57ce880ba
Author: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 08:34:57 2016 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 08:34:57 2016 +0000
URL: https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=dd846716
bump/rev-bump deps of cookiecutter
dev-python/binaryornot/binaryornot-0.4.0.ebuild | 13 ++---
dev-python/future/Manifest | 1 +
.../files/future-0.15.2-fix-tests-python3.5.patch | 56 ++++++++++++++++++++
dev-python/future/future-0.15.2.ebuild | 27 ++++++++++
dev-python/future/metadata.xml | 21 ++++++++
dev-python/pytest-mock/Manifest | 2 +-
...mock-0.8.1.ebuild => pytest-mock-0.11.0.ebuild} | 15 ++++--
dev-python/ruamel-base/ruamel-base-1.0.0.ebuild | 6 +--
dev-python/ruamel-yaml/Manifest | 2 +-
dev-python/ruamel-yaml/ruamel-yaml-0.10.12.ebuild | 60 ----------------------
dev-python/ruamel-yaml/ruamel-yaml-0.11.7.ebuild | 43 ++++++++++++++++
dev-python/whichcraft/whichcraft-0.1.1.ebuild | 14 +++--
12 files changed, 179 insertions(+), 81 deletions(-)
diff --git a/dev-python/binaryornot/binaryornot-0.4.0.ebuild b/dev-python/binaryornot/binaryornot-0.4.0.ebuild
index 68536cf..a16ac4a 100644
--- a/dev-python/binaryornot/binaryornot-0.4.0.ebuild
+++ b/dev-python/binaryornot/binaryornot-0.4.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit distutils-r1
@@ -18,11 +18,12 @@ KEYWORDS="~amd64"
IUSE="test"
RDEPEND=">=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
- dev-python/hypothesis[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
python_test() {
- esetup.py test || die
+ esetup.py test
}
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
new file mode 100644
index 0000000..feed344
--- /dev/null
+++ b/dev-python/future/Manifest
@@ -0,0 +1 @@
+DIST future-0.15.2.tar.gz 1583441 SHA256 3d3b193f20ca62ba7d8782589922878820d0a023b885882deec830adbf639b97 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee WHIRLPOOL 557b53495033d4586dc0f34837cc7f0cab12fb770abda56049fd90b5bac3e36db561e185d86e8a08b153869f0f692ccf0b305f5edc20871edde487faa1b1fc4f
diff --git a/dev-python/future/files/future-0.15.2-fix-tests-python3.5.patch b/dev-python/future/files/future-0.15.2-fix-tests-python3.5.patch
new file mode 100644
index 0000000..d821a19
--- /dev/null
+++ b/dev-python/future/files/future-0.15.2-fix-tests-python3.5.patch
@@ -0,0 +1,56 @@
+diff --git a/tests/test_future/test_builtins.py b/tests/test_future/test_builtins.py
+index a6db4fd..1245a64 100644
+--- a/tests/test_future/test_builtins.py
++++ b/tests/test_future/test_builtins.py
+@@ -524,12 +524,11 @@ class BuiltinTest(unittest.TestCase):
+ self.assertRaises(TypeError, compile)
+ self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'badmode')
+ self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'single', 0xff)
+- # Raises TypeError in Python < v3.5, ValueError in v3.5:
+- # self.assertRaises(TypeError, compile, chr(0), 'f', 'exec')
+ self.assertRaises(TypeError, compile, 'pass', '?', 'exec',
+ mode='eval', source='0', filename='tmp')
+ compile('print("\xe5")\n', '', 'exec')
+- self.assertRaises(TypeError, compile, chr(0), 'f', 'exec')
++ # Raises TypeError in Python < v3.5, ValueError in v3.5:
++ self.assertRaises((TypeError, ValueError), compile, chr(0), 'f', 'exec')
+ self.assertRaises(ValueError, compile, str('a = 1'), 'f', 'bad')
+
+ # test the optimize argument
+@@ -1287,7 +1286,7 @@ class BuiltinTest(unittest.TestCase):
+ self.assertAlmostEqual(pow(-1, 1/3), 0.5 + 0.8660254037844386j)
+
+ # Raises TypeError in Python < v3.5, ValueError in v3.5:
+- # self.assertRaises(TypeError, pow, -1, -2, 3)
++ self.assertRaises((TypeError, ValueError), pow, -1, -2, 3)
+ self.assertRaises(ValueError, pow, 1, 2, 0)
+
+ self.assertRaises(TypeError, pow)
+diff --git a/tests/test_future/test_bytes.py b/tests/test_future/test_bytes.py
+index f30e740..ffaa58d 100644
+--- a/tests/test_future/test_bytes.py
++++ b/tests/test_future/test_bytes.py
+@@ -4,6 +4,7 @@ Tests for the backported bytes object
+ """
+
+ from __future__ import absolute_import, unicode_literals, print_function
++import sys
+ from future.builtins import *
+ from future import utils
+
+@@ -534,6 +535,7 @@ class TestBytes(unittest.TestCase):
+ self.assertRaises(ValueError, bytes.maketrans, b'abc', b'xyzq')
+ self.assertRaises(TypeError, bytes.maketrans, 'abc', 'def')
+
++ @unittest.skipIf(sys.version_info >= (3, 5), 'implemented in python 3.5+')
+ @unittest.expectedFailure
+ def test_mod(self):
+ """
+@@ -551,6 +553,7 @@ class TestBytes(unittest.TestCase):
+ a = b % (b'seventy-nine', 79)
+ self.assertEqual(a, b'seventy-nine / 100 = 79%')
+
++ @unittest.skipIf(sys.version_info >= (3, 5), 'implemented in python 3.5+')
+ @unittest.expectedFailure
+ def test_imod(self):
+ """
diff --git a/dev-python/future/future-0.15.2.ebuild b/dev-python/future/future-0.15.2.ebuild
new file mode 100644
index 0000000..38a598c
--- /dev/null
+++ b/dev-python/future/future-0.15.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Clean single-source support for Python 3 and 2"
+HOMEPAGE="http://python-future.org/"
+SRC_URI="mirror://pypi/f/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-fix-tests-python3.5.patch" )
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/future/metadata.xml b/dev-python/future/metadata.xml
new file mode 100644
index 0000000..6281acd
--- /dev/null
+++ b/dev-python/future/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>h.chr@mail.ru</email>
+ <name>Horea Christian</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ future is the missing compatibility layer between Python 2 and
+ Python 3. It allows you to use a single, clean Python
+ 3.x-compatible codebase to support both Python 2 and Python 3
+ with minimal overhead.
+ </longdescription>
+ <upstream>
+ <remote-id type="pypi">future</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 5d5bad7..58bcb8b 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1 +1 @@
-DIST pytest-mock-0.8.1.zip 16596 SHA256 2ba9b5feebc3c4fd5fc34df8c4b8401f9d5936aa8c64be15d74dae303467946b SHA512 30b20e315124a1a0a2aadd548d8b6b4a4762b425e5b4807e7ac4661cdaa3e5b62876fe62a68a3e3de693d2910f8c0c24be3e82e5b24215e5692c80fedfd1f8df WHIRLPOOL e934e1dfa0fbeeab5b72a7048d940e499e057ea1c631c21339c54e15792f7a0aaa119fda8c45922e47e2efbfe276fb82725d0b1d22bb877f952896887e71b790
+DIST pytest-mock-0.11.0.zip 19333 SHA256 a897c6283aa116c161f5f08b8f73301685f6b8abfcd0b9b0d000668bc0faaaa3 SHA512 b3b1ac890218c5b59888fe127a7db83f579f911653fc2b9703d9c0b9886ba5a6af8c52724e25896777e4889f6f30799d0d09cd61de53256340ce3eba02a1b582 WHIRLPOOL 9cb064721950ff85bf651fadac0bb76099440cd56ed46ebc185df98d4119bd8a1849ae387a47240935ce5fde3e962ab631e2c7a5e243bb976ab84ebf6e85c6ae
diff --git a/dev-python/pytest-mock/pytest-mock-0.8.1.ebuild b/dev-python/pytest-mock/pytest-mock-0.11.0.ebuild
similarity index 65%
rename from dev-python/pytest-mock/pytest-mock-0.8.1.ebuild
rename to dev-python/pytest-mock/pytest-mock-0.11.0.ebuild
index b9e31cf..3f42d85 100644
--- a/dev-python/pytest-mock/pytest-mock-0.8.1.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-0.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4})
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit distutils-r1
@@ -17,5 +17,10 @@ KEYWORDS="~amd64"
IUSE="test"
RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="app-arch/unzip
- test? ( ${RDEPEND} )"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ app-arch/unzip"
+
+python_test() {
+ py.test -v || die
+}
diff --git a/dev-python/ruamel-base/ruamel-base-1.0.0.ebuild b/dev-python/ruamel-base/ruamel-base-1.0.0.ebuild
index 80d4447..501b8c9 100644
--- a/dev-python/ruamel-base/ruamel-base-1.0.0.ebuild
+++ b/dev-python/ruamel-base/ruamel-base-1.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit distutils-r1
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index d293c31..7121181 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1 +1 @@
-DIST ruamel.yaml-0.10.12.tar.gz 234712 SHA256 2bfd7d00c0ca859dbf1a7abca79969eedd25c76a976b7d40f94e1891a6e73f2c SHA512 f7f6f91101cb1cf1b849c5c1bb64fc07fb2791f55ef81e4c752fcfbd98de59ab0fc861c5e06b30a4d579affe77e4532b079d35cd86f14a14e7f4e6704d7d0cb2 WHIRLPOOL e2e59c41ca643e8f7b5244509e5789efe73c531c9ffdaee9f2f4c0d3685495327a36804cae20c184fa7a94787e9db35a654046d9bd86318cf1fc25c91ced5631
+DIST ruamel-yaml-0.11.7.tar.bz2 229769 SHA256 663439011c8dd624371748671e1299e9573579907ecd9fa1972dd7868ade9ecc SHA512 8cc20fd6a3ba79df4ca08a258c762f8f9dea3a4d6a04efded5b7683cbfe57ebb5388d508b520c896677e3236fe76f4783e2d72c20b1f1c5e9d1148159b7ac945 WHIRLPOOL 0b402c0378b55eea91b453ad3688f9fbd153c3059bc570884e5109b774c534d4f92820bcf4c9f2e7432b7e70b96deceedbfad1e7b8e818443b5031600050fb84
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.10.12.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.10.12.ebuild
deleted file mode 100644
index 09bff93..0000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.10.12.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-#FIXME: While ruamel.yaml technically supports Python 2.7, such support
-#conditionally requires an additional as-yet-unimplemented ebuild:
-#"ruamel.ordereddict". On adding such ebuild to the overlay, add "python2_7"
-#back to ${PYTHON_COMPAT} below *AND* add the following conditional
-#dependency to ${RDEPEND}:
-# $(python_gen_cond_dep 'dev-python/ruamel_ordereddict[${PYTHON_USEDEP}]' 'python2*'
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy{,3} )
-
-inherit distutils-r1
-
-MY_PN="ruamel.yaml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="https://pypi.python.org/pypi/ruamel.yaml"
-SRC_URI="mirror://pypi/r/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libyaml test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# the roundtrip.py is currently missing from the tarball
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/ruamel-base[${PYTHON_USEDEP}]
- libyaml? ( dev-libs/libyaml )
- $(python_gen_cond_dep 'dev-python/ruamel-ordereddict[${PYTHON_USEDEP}]' python2_7)"
-
-DEPEND="${RDEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-DOCS="README.rst"
-
-python_configure_all() {
- if ! use libyaml ; then
- sed -i -e 's|\(ext_modules\)|no_\1|' __init__.py || die
- fi
-}
-
-python_install() {
- distutils-r1_python_install --single-version-externally-managed
-}
-
-# Run tests with verbose output failing on the first failing test.
-python_test() {
- py.test -vvx test
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.11.7.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.11.7.ebuild
new file mode 100644
index 0000000..5acef36
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.11.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="https://pypi.python.org/pypi/ruamel.yaml"
+SRC_URI="https://bitbucket.org/ruamel/yaml/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libyaml test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( libyaml )"
+# ^ tests can't be properly unbundled from the libyaml c-extension
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/ruamel-base[${PYTHON_USEDEP}]
+ libyaml? ( dev-libs/libyaml )
+ $(python_gen_cond_dep 'dev-python/ruamel-ordereddict[${PYTHON_USEDEP}]' python2_7)"
+
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_configure_all() {
+ if ! use libyaml ; then
+ sed -i -e 's|\(ext_modules\)|no_\1|' __init__.py || die
+ fi
+}
+
+python_install() {
+ distutils-r1_python_install --single-version-externally-managed
+}
+
+python_test() {
+ py.test -v _test/test_*.py || die
+}
diff --git a/dev-python/whichcraft/whichcraft-0.1.1.ebuild b/dev-python/whichcraft/whichcraft-0.1.1.ebuild
index 91b4688..73c0bae 100644
--- a/dev-python/whichcraft/whichcraft-0.1.1.ebuild
+++ b/dev-python/whichcraft/whichcraft-0.1.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit distutils-r1
-DESCRIPTION=" This package provides cross-platform cross-python shutil.which functionality"
+DESCRIPTION="Provides cross-platform cross-python shutil.which functionality"
HOMEPAGE="https://github.com/pydanny/whichcraft"
SRC_URI="https://github.com/pydanny/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -17,8 +17,12 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
python_test() {
- ${PYTHON} test_whichcraft.py || die
+ py.test -v || die
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-03-09 8:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-09 8:40 [gentoo-commits] dev/dev-zero:master commit in: dev-python/future/files/, dev-python/future/, dev-python/whichcraft/, Tiziano Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox