commit: 1c99690a7fbdf5c87a70ffeba1ed064927243677
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 18:11:30 2021 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sun May 23 18:11:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c99690a
dev-python/PyUtilib-6.0.0: Version bump, py39
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
dev-python/PyUtilib/Manifest | 1 +
dev-python/PyUtilib/PyUtilib-5.7.2.ebuild | 4 +--
...PyUtilib-5.7.2.ebuild => PyUtilib-6.0.0.ebuild} | 33 ++++++----------------
.../PyUtilib/files/PyUtilib-6.0.0-tests.patch | 12 ++++++++
4 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/dev-python/PyUtilib/Manifest b/dev-python/PyUtilib/Manifest
index 728046d1d58..a1658209491 100644
--- a/dev-python/PyUtilib/Manifest
+++ b/dev-python/PyUtilib/Manifest
@@ -1 +1,2 @@
DIST PyUtilib-5.7.2.tar.gz 1566034 BLAKE2B
913c6576b39f14c19e2e633c36ade33fe812c77a37374c7c14d2fb4384ca38f68efd55209d70e96d9a78fea2fcf1cf83423680d0787da2d03cab88e59a208b96
SHA512
d9d7d890cdb524bb055885354784f2af01967164ce88cf3b144ccffb0a855ef34243fd518c58193517ecfc50f3c2e3ca333f026951c1ab0b38ce181ecf9e7750
+DIST PyUtilib-6.0.0.tar.gz 1569916 BLAKE2B
ee4085b597e928c5d6602b647f122c562f2e05dcaf300217cea9c5bc652f6acb5dbe5a075cbbbc1b81497987ab5c658f86cc3e44e16cae02a37d546b2e925a9b
SHA512
7841a84ee8d66d2d7af3db810e4d787030acbd8e3e81c3f61251ea160931feddeab6f4d205977a411964359f1cb7e7e59e846593c113093e01c48b81784f7477
diff --git a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
index e1a41622672..e1418c3cb92 100644
--- a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
DISTUTILS_IN_SOURCE_BUILD=1
inherit distutils-r1
diff --git a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
similarity index 53%
copy from dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
copy to dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
index e1a41622672..d0f3e6c3885 100644
--- a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
DISTUTILS_IN_SOURCE_BUILD=1
inherit distutils-r1
@@ -18,21 +18,16 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
-
PATCHES=(
- "${FILESDIR}/pyutilib-5.6.5-tests.patch"
+ "${FILESDIR}/PyUtilib-6.0.0-tests.patch"
)
-python_prepare_all() {
- # remove some tests that are completely broken
- rm pyutilib/component/app/tests/test_simple.py || die
+distutils_enable_tests unittest
+
+python_install_all() {
+ distutils-r1_python_install_all
- distutils-r1_python_prepare_all
+ find "${ED}" -name '*.pth' -delete || die
}
python_test() {
@@ -41,15 +36,5 @@ python_test() {
local -x PYTHONPATH="${PWD}:${TEST_DIR}/lib" \
COLUMNS=80
- nosetests -v --with-xunit --xunit-file=TEST-pyutilib.xml pyutilib ||
die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- find "${ED}" -name '*.pth' -delete || die
-}
-
-python_install() {
- distutils-r1_python_install
+ eunittest
}
diff --git a/dev-python/PyUtilib/files/PyUtilib-6.0.0-tests.patch
b/dev-python/PyUtilib/files/PyUtilib-6.0.0-tests.patch
new file mode 100644
index 00000000000..33dcd460581
--- /dev/null
+++ b/dev-python/PyUtilib/files/PyUtilib-6.0.0-tests.patch
@@ -0,0 +1,12 @@
+diff --git a/pyutilib/component/loader/tests/test_egg.py
b/pyutilib/component/loader/tests/test_egg.py
+index c8674d0..7126e5c 100644
+--- a/pyutilib/component/loader/tests/test_egg.py
++++ b/pyutilib/component/loader/tests/test_egg.py
+@@ -23,6 +23,7 @@ except ImportError:
+
+
+ @unittest.skipIf(not pkg_resources_avail, "Cannot import 'pkg_resources'")
[email protected](sys.hexversion >= 0x03090000, "Example eggs not generated
for python >= 3.9")
+ class Test(pyutilib.th.TestCase):
+
+ def test_egg1(self):
