diff options
24 files changed, 1 insertions, 647 deletions
diff --git a/dev-python/Pyro4/Manifest b/dev-python/Pyro4/Manifest index 2f224e53fb6f..2399196aa57b 100644 --- a/dev-python/Pyro4/Manifest +++ b/dev-python/Pyro4/Manifest @@ -1,2 +1 @@ -DIST Pyro4-4.80.tar.gz 515103 BLAKE2B 5d2b69ba020117947a36c9c75f884434a3452167fa2e586e3a5b0e6deb1d0c8c54dd06a20b9568b53a0a6c42a847d880636e3abe37090246d5f34ca84e915b36 SHA512 8e41285674edbe5c8d5ac63e33406c5ff7b6366d5dd251a1755eff81611193278a473ed8b15f995bc0ba2775dc5d316eb6a3cafd63626b95820591ea3a0a92e3 DIST Pyro4-4.81.tar.gz 514678 BLAKE2B ffe9edcb947203b37cf1b13b2380f2b7d76357a5bca36e454fe67f6bd0d34574f5df429dd784ba2c2bc69c0188edd14e4572f12f5c137d87d2898f01ea3e855c SHA512 3848d473acd624ae1356ad3470c669eb0bc30287691ff8b9fc27fb0591ba305812c6be1946d6a2a91377e222a9e114f05ed18170d1b035dec24e436ab8dadc59 diff --git a/dev-python/Pyro4/Pyro4-4.80.ebuild b/dev-python/Pyro4/Pyro4-4.80.ebuild deleted file mode 100644 index 58699ab81c52..000000000000 --- a/dev-python/Pyro4/Pyro4-4.80.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 - -MY_PN="Pyro4" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Distributed object middleware for Python (RPC)" -HOMEPAGE="https://pypi.org/project/Pyro4/ - https://github.com/irmen/Pyro4" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 ppc x86" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/serpent-1.27[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - >=dev-python/cloudpickle-1.2.1[${PYTHON_USEDEP}] - dev-python/dill[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.4.6[${PYTHON_USEDEP}] - )" - -python_prepare_all() { - # Disable tests requiring network connection. - rm tests/PyroTests/test_naming.py || die - sed \ - -e "s/testStartNSfunc/_&/" \ - -i tests/PyroTests/test_naming2.py || die - - sed \ - -e "s/testBroadcast/_&/" \ - -e "s/testGetIP/_&/" \ - -i tests/PyroTests/test_socket.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - esetup.py test -} - -python_install_all() { - use doc && HTML_DOCS=( docs/. ) - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - distutils-r1_python_install_all -} diff --git a/dev-python/charset_normalizer/metadata.xml b/dev-python/charset_normalizer/metadata.xml index 0f779de30aec..3513dc8b2c8a 100644 --- a/dev-python/charset_normalizer/metadata.xml +++ b/dev-python/charset_normalizer/metadata.xml @@ -4,6 +4,7 @@ <maintainer type="project"> <email>python@gentoo.org</email> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">ousret/charset_normalizer</remote-id> <remote-id type="pypi">charset-normalizer</remote-id> diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest index 09b1b90706e3..99a2e45943cd 100644 --- a/dev-python/identify/Manifest +++ b/dev-python/identify/Manifest @@ -1,4 +1,3 @@ -DIST identify-2.2.13.tar.gz 101136 BLAKE2B b1835ca6b576a15be16de124554cfaf7b6dc55a1dfee70021613d35251135c295c3acf141eb645823add4c260bec9fdcde4799f0b72fbd57bc7a2e8659e416bd SHA512 37764325268c164028b7719f91571c006c9c6db3f4bba5a93d20f3d9ea30712cfe7e5710b175266a3d74f3f85485f16ebf7d21486d4329050b55e5835e8b4197 DIST identify-2.2.14.tar.gz 101144 BLAKE2B 9a23595173ab2ebfcbbcfc503e9750ef1e9c0c068e9d1a1b2f47dd2e08787f734541a79ae65b4a72a7de076b8f7ab4f877f3bb049560f33b38698729b9d5f3ab SHA512 9dc27e745f30fc1e6ee5135cdb82de004a5c60f17c47ab3e1deffe1c3c04adc47211bde161216be202db2171711a7dfea5f0ba60a56fea0cbc75ec6d55c6203f DIST identify-2.2.15.tar.gz 101146 BLAKE2B 1855598314c191a9e4d2f73c2c7a424957a76177df1daf32b4c7de6ddbda4439fac0860ed105e4a2ca4aef0555843157499e9840cbbccf42cf728aef93b13607 SHA512 5b85c07603381174fb4265ad8fc411645dc0cecb68b3fc9b2afa7111f18eae7cf39d5cf1000eda8ded256f441a4bf05d9ded11f31c9aa80f55efaf2dc6745697 DIST identify-2.3.0.tar.gz 101179 BLAKE2B d51911a69a9845d136c0b5ce50a3ed94c50d80d6d8c89a2c823f1a85cafef373dab68716c5b38907bc920ca5f4d67ef969d598539e59e32bc2c36a0427d37765 SHA512 356e3c983273a771c06863a63fb53bdca9e3df3a50382f47da0d5ef7cee1b83d9279eb0d1e6c28409b2550f6e16eb793901147983582d792cdd39bb4d4c6e9f1 diff --git a/dev-python/identify/identify-2.2.13.ebuild b/dev-python/identify/identify-2.2.13.ebuild deleted file mode 100644 index 0310f5673f98..000000000000 --- a/dev-python/identify/identify-2.2.13.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -DESCRIPTION="File identification library for Python" -HOMEPAGE="https://github.com/pre-commit/identify" -SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86" - -RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]" - -distutils_enable_tests pytest diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest index 5a3f027b3149..aff995481036 100644 --- a/dev-python/loky/Manifest +++ b/dev-python/loky/Manifest @@ -1,2 +1 @@ -DIST loky-2.9.0.tar.gz 115019 BLAKE2B 2aa2042e32821b67db8b8de12d4b380d22af93d308bb35878271a4859325d6740a3bdab70b464a2c0d0af143903c8af3da81b4b804605cdae88779fefd7971a6 SHA512 d49354b834251f6f05a689ac44464aafa5a7a5b4a8ef84a308ec3bda138e810fc3dc31aa628307984dc69386a210f442d4c202b9499ae3e3864837b47a5b0cd9 DIST loky-3.0.0.tar.gz 152463 BLAKE2B 99f0a1fc85e879626d12402dd4fee4b92345eab9520b1afaf95bbf869d2dc9e429f1f9810554e10d97f0ecbc4add28b1cbaee0477de05aa366faeb335eaef7c8 SHA512 ad171bfac031ab4d6749bde416031e905eb29adb97dab9c3348791c9df78b17e1e3eab8a354954d7c16fb2095ccc03d26cf2153fe53a546007a7a89c6046cb36 diff --git a/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch b/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch deleted file mode 100644 index 51cbfb348a51..000000000000 --- a/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0d31dc24ca9688c11d1fe53fa1283728ecc50706 Mon Sep 17 00:00:00 2001 -From: Arthur Zamarin <arthurzam@gmail.com> -Date: Mon, 2 Aug 2021 18:35:31 +0300 -Subject: [PATCH] Fix no attribute import_module for python 3.10 - -In python 3.10, the `import_module` has moved from the -`test.support` module to `test.support.import_helper`. - -As fix, try to import the from the new place and if unknown try from -the old place. ---- - tests/_test_process_executor.py | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/tests/_test_process_executor.py b/tests/_test_process_executor.py -index 65d9a2c9..3bd0b12d 100644 ---- a/tests/_test_process_executor.py -+++ b/tests/_test_process_executor.py -@@ -1,15 +1,18 @@ - from __future__ import print_function - try: -- import test.support -+ try: -+ from test.support.import_helper import import_module -+ except ImportError: -+ from test.support import import_module - - # Skip tests if _multiprocessing wasn't built. -- test.support.import_module('_multiprocessing') -+ import_module('_multiprocessing') - # Skip tests if sem_open implementation is broken. -- test.support.import_module('multiprocessing.synchronize') -+ import_module('multiprocessing.synchronize') - # import threading after _multiprocessing to raise a more revelant error - # message: "No module named _multiprocessing" if multiprocessing is not - # compiled without thread support. -- test.support.import_module('threading') -+ import_module('threading') - except ImportError: - pass - diff --git a/dev-python/loky/files/loky-2.9.0-libc.patch b/dev-python/loky/files/loky-2.9.0-libc.patch deleted file mode 100644 index 58cceab01eb2..000000000000 --- a/dev-python/loky/files/loky-2.9.0-libc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4100bb481dd1599be3deae8539ff9eac2d9b7104 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 8 Mar 2021 10:32:38 +0100 -Subject: [PATCH] FIX load libc correctly in test_reusable_executor - -Fix test_reusable_executor to load libc via "c" library rather than -"libc". The latter is incorrect, and does not work in the newest -versions of Python anymore, see https://bugs.python.org/issue42580. ---- - tests/test_reusable_executor.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_reusable_executor.py b/tests/test_reusable_executor.py -index 1ff5b8b..d24d2de 100644 ---- a/tests/test_reusable_executor.py -+++ b/tests/test_reusable_executor.py -@@ -32,7 +32,7 @@ if sys.platform == "win32": - else: - from signal import SIGKILL - from ctypes.util import find_library -- libc = ctypes.CDLL(find_library("libc")) -+ libc = ctypes.CDLL(find_library("c")) - - - try: --- -2.30.1 - diff --git a/dev-python/loky/loky-2.9.0.ebuild b/dev-python/loky/loky-2.9.0.ebuild deleted file mode 100644 index d1db85d53e51..000000000000 --- a/dev-python/loky/loky-2.9.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -DESCRIPTION="Robust and reusable Executor for joblib" -HOMEPAGE="https://github.com/joblib/loky" -SRC_URI=" - https://github.com/joblib/loky/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86" - -RDEPEND=" - dev-python/cloudpickle[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}"/${P}-libc.patch - "${FILESDIR}"/${P}-fix-py3.10-tests.patch -) - -python_test() { - local args=( - # docker, seriously? - --deselect 'tests/test_loky_module.py::test_cpu_count_cfs_limit' - # hangs, and even pytest-timeout does not help - --deselect 'tests/test_reusable_executor.py::TestExecutorDeadLock::test_deadlock_kill' - # one test that uses a lot of memory, also broken on 32-bit - # platforms - --skip-high-memory - # breaks teardown - -p no:xvfb - ) - - epytest "${args[@]}" -} diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest index 38a5bb2fbf1b..968fc538c45f 100644 --- a/dev-python/markups/Manifest +++ b/dev-python/markups/Manifest @@ -1,2 +1 @@ -DIST Markups-3.1.1.tar.gz 20482 BLAKE2B 26fb19e11aaede8eeadc5a3022785dd3663e7002c5fc4b17c3718d68bda55a9cba07fc1c83a78ca4dee06b4e911b74701fe11865e8933a9d385d032fac00eb0d SHA512 9e8e7b3cc86127fed0367faf257d761e0eae4ca5e11a9ddc8e99b2fc88c76ddb218ee371added56e2c19f5772754adc4c01a09503c308220f6a9d35e736220d7 DIST Markups-3.1.2.tar.gz 20608 BLAKE2B 01f5e740b4d26c4a8c611070b0ffb879009cc241bd320f257d266e57f9f35becd728a45f1bbff98eb066c24abfb21a84c36d07814e0f54550c259c62fd48dbdb SHA512 5374c6c80eb71b4190af4c3ba47ec46fe7a92739d72feb023a571488dde6fdc377e98f2e24bc0c4e6cb7b4aa3b0f8aea90befa93e301cf6b02fcc4856affbceb diff --git a/dev-python/markups/markups-3.1.1.ebuild b/dev-python/markups/markups-3.1.1.ebuild deleted file mode 100644 index 91e91363b010..000000000000 --- a/dev-python/markups/markups-3.1.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 - -MY_P=${P^} - -DESCRIPTION="A wrapper around various text markups" -HOMEPAGE=" - https://pymarkups.readthedocs.io/en/latest/ - https://github.com/retext-project/pymarkups - https://pypi.org/project/Markups/ -" -SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/importlib_metadata[${PYTHON_USEDEP}] - ' python3_7 pypy3) - dev-python/markdown[${PYTHON_USEDEP}] - dev-python/python-markdown-math[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - test? ( - app-text/pytextile[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/pymdown-extensions[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests unittest diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest index f8cc3fe56a8a..83dd9747843d 100644 --- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest +++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest @@ -1,3 +1 @@ DIST mkdocs-git-revision-date-localized-plugin-0.10.0.tar.gz 368270 BLAKE2B c00956c86394bdfc8b2fe9e51e7588362f6bd7bc3bde174c1d387377418a47f56f01137e597405146280bba195ebf7aa5cadf67e9514734e5874df69e4990857 SHA512 8ce742cd995c180372a9d76a96c19f4f7c7b9fafe5c67f13e2c1d7377dc18e071d379cd741cb5f4a84be9f275b3f3d74d23875e766a7dda86498acb0a08d4344 -DIST mkdocs-git-revision-date-localized-plugin-0.9.2.tar.gz 367301 BLAKE2B ac4d69117dea856a209d144e452cf408ee3d111eaa8a9825602b9f8d604a79143e96a51e67b74e430eecc6ee33335161e409149220a8b216f3b47f22e7a49f12 SHA512 11714323a6e300d0d8d05198f617019158dc48ba43e8a685f52702da7f52558f1358dfce294dcd421ba9d59131c17e4d6ea6ff483397055dee62dffb76032d4c -DIST mkdocs-git-revision-date-localized-plugin-0.9.3.tar.gz 367885 BLAKE2B 3c7aa4a5cfcb585c022c9a652ff0b5be8c309298f69c69973a9442913ac4d12f14a3f5783627d9574cffc9c438e98678641d58e77f6712e0ddf68ac77ee098fa SHA512 8a345770a6f40bacc0899a7fcf3d056874f3a947ffbd001bd5885ef88e813e4d405ab7d7a06be3adb5ef34d5ef1f449432b0e9594b79a9d4a9350901c692cc10 diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild deleted file mode 100644 index fbb93162a538..000000000000 --- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -DOCS_BUILDER="mkdocs" -DOCS_DEPEND="dev-python/mkdocs-material" - -inherit distutils-r1 docs - -DESCRIPTION="Display the localized date of the last git modification of a markdown file" -HOMEPAGE=" - https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/ - https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/ -" -SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - >=dev-python/Babel-2.7.0[${PYTHON_USEDEP}] - dev-python/GitPython[${PYTHON_USEDEP}] - >=dev-python/mkdocs-1.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/click[${PYTHON_USEDEP}] - dev-python/mkdocs-material[${PYTHON_USEDEP}] - dev-vcs/git - ) - doc? ( dev-vcs/git ) -" - -distutils_enable_tests --install pytest - -python_prepare_all() { - # mkdocs-git-revision-date-localized-plugin's tests need git repo - if use test || use doc; then - git init -q || die - git config --global user.email "you@example.com" || die - git config --global user.name "Your Name" || die - git add . || die - git commit -qm 'init' || die - fi - - # The release tarball is missing some required file - # FileNotFoundError: [Errno 2] No such file or directory: - rm tests/test_builds.py || die - - distutils-r1_python_prepare_all -} diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.3.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.3.ebuild deleted file mode 100644 index 4a3ee1f62f98..000000000000 --- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..9} ) - -DOCS_BUILDER="mkdocs" -DOCS_DEPEND="dev-python/mkdocs-material" - -inherit distutils-r1 docs - -DESCRIPTION="Display the localized date of the last git modification of a markdown file" -HOMEPAGE=" - https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/ - https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/ -" -SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=dev-python/Babel-2.7.0[${PYTHON_USEDEP}] - dev-python/GitPython[${PYTHON_USEDEP}] - >=dev-python/mkdocs-1.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/click[${PYTHON_USEDEP}] - dev-python/mkdocs-material[${PYTHON_USEDEP}] - dev-vcs/git - ) - doc? ( dev-vcs/git ) -" - -distutils_enable_tests --install pytest - -python_prepare_all() { - # mkdocs-git-revision-date-localized-plugin's tests need git repo - if use test || use doc; then - git init -q || die - git config --global user.email "you@example.com" || die - git config --global user.name "Your Name" || die - git add . || die - git commit -qm 'init' || die - fi - - distutils-r1_python_prepare_all -} diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest index a6f60fdd3f54..a3d94fbddfae 100644 --- a/dev-python/networkx/Manifest +++ b/dev-python/networkx/Manifest @@ -1,2 +1 @@ -DIST networkx-2.6.2.tar.gz 1842077 BLAKE2B 8493e2d6a64d140b012ea443e9b1dc2409f8208dc1678c1d21cfd19bbdc07df6e9051aefe994d5fa6460db48320d563bb3051150782545ab5f671b7aafda4d0a SHA512 7006dcd209cce79f0f6cac4884797775422bd90fd3e8abb2eee70e6e00c9a25a785dd5856fc1657019a2b5c13a6fa5f705ea2e650c15a1f9d7d93580bc299219 DIST networkx-2.6.3.tar.gz 1844862 BLAKE2B 408f97e334c3e0cec6d40d15d6ba8dc3c07cbd162fb31b301696c53ff1d924fd12f60d34df3f1b56fd036f2a344933a3b5c41a1aa2f91e5d5ca39f922cdfc41b SHA512 709b5126039c4b34a9b2ed60723e8bab3f591203f3ae8d87474e0f49f52b94b9c15568c78cc9e05e2bf997bc65a6177762bc41b0a44093ee59f6eaa0087d0f34 diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml index b32cbe03944e..b0d0d5f8a56f 100644 --- a/dev-python/networkx/metadata.xml +++ b/dev-python/networkx/metadata.xml @@ -21,8 +21,4 @@ <remote-id type="pypi">networkx</remote-id> <remote-id type="github">networkx/networkx</remote-id> </upstream> - <use> - <flag name="extras">Provide graph drawing and graph layout algorithms along with shapefile format reading and writing</flag> - <flag name="yaml">Provides YAML format reading and writing</flag> - </use> </pkgmetadata> diff --git a/dev-python/networkx/networkx-2.6.2.ebuild b/dev-python/networkx/networkx-2.6.2.ebuild deleted file mode 100644 index 9e0f4791bb22..000000000000 --- a/dev-python/networkx/networkx-2.6.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 virtualx - -DESCRIPTION="Python tools to manipulate graphs and complex networks" -HOMEPAGE="https://networkx.org/ https://github.com/networkx/networkx" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="examples extras xml yaml" - -RDEPEND=" - >=dev-python/matplotlib-3.3[${PYTHON_USEDEP}] - >=dev-python/numpy-1.19[${PYTHON_USEDEP}] - >=dev-python/pandas-1.1[${PYTHON_USEDEP}] - >=dev-python/scipy-1.6.2[${PYTHON_USEDEP}] - extras? ( - >=dev-python/pydot-1.4.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/pygraphviz-1.7[${PYTHON_USEDEP}] - >=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}] - ' python3_{8..9}) - ) - xml? ( >=dev-python/lxml-4.5[${PYTHON_USEDEP}] ) - yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )" - -distutils_enable_tests pytest - -python_test() { - local deselect=() - virtx epytest -p no:django ${deselect[@]/#/--deselect } -} - -python_install_all() { - use examples && dodoc -r examples - - distutils-r1_python_install_all -} diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest index fbaccdc73a1b..a2479851f517 100644 --- a/dev-python/pandocfilters/Manifest +++ b/dev-python/pandocfilters/Manifest @@ -1,2 +1 @@ -DIST pandocfilters-1.4.3.tar.gz 16586 BLAKE2B 975000f96475e8338a54d8a96793a8bcfbf62c5251897a01c185a6708ff7c47f2a1bee617e4e25d3854e7de1d078769bbd887527beb20ebb7e06f0c4da59126c SHA512 9c7ae1329c103ff2baae3488edfcbfaba183bc94146b29e413e7e83ba2ff2dee69823138bf213f5c81a8b0097c2d9329bd05620b10c646662a9617aae7a528a9 DIST pandocfilters-1.5.0.tar.gz 8405 BLAKE2B 962da4f0e0d469f28f35eb181b10df317cb4130d796f62fe7ef27078d257e52a3554f93c64c303f617bbdd8b517868024686c8fd9f82b83a0ae6a923708c21a5 SHA512 32586d4718fd4b7047d850ca767ffacf8fba60844edf8469458e8549286e571774e7178678c7121be62b9a3c819a25de2d30b8fe58a539553336f322b87e836e diff --git a/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild deleted file mode 100644 index 7f1a789f2202..000000000000 --- a/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 - -DESCRIPTION="Utilities for writing pandoc filters in python" -HOMEPAGE="https://github.com/jgm/pandocfilters" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest index 4615a79ba6f6..07ce29046963 100644 --- a/dev-python/progressbar2/Manifest +++ b/dev-python/progressbar2/Manifest @@ -1,4 +1,3 @@ -DIST progressbar2-3.53.1.tar.gz 44741 BLAKE2B 80f406adf42c5c57ecad87002426115e1254339d5cd310dd42f560f48a1123702dffbba8f26114a01f2bd5be75a29cb12cc1c091d5554509b6282ceb2b66fb76 SHA512 4817bbb45d0f51ee2b3feceec56b3177ed5d0561894a13eea53a30e8b9aad5805483b5b669af93f3fd0cc958984b8a5c2a14ba3591e0a85be12180d057bc2f81 DIST progressbar2-3.53.3.tar.gz 240718 BLAKE2B 01f0d0cf6c546855d2cac10cc1164fb68308b60e1095499f8838d7c82127860235f65d742a137db5acdce6ac50e65aff7580a6f6a344942d4c78375cc23085b4 SHA512 6399d8fa8270fc0241969d94ce284161516b42c0fdc3fbf2dfe8a0dfcca72933d23ec9b99c4118cebbca376f5821337aacd11fcee6eee5988d6caf73d1f3112d DIST progressbar2-3.54.0.tar.gz 365257 BLAKE2B b36c7b795a9afa5f35f447e325f217a0d6ff092081265f43654fb093c67bf94fe8ffcb2d8d2a51ed50036ccdc535afac69b5a1b1ead4515b636105edbe927f55 SHA512 d8a896aea4eed5e65347227417e691156890c202f40a792a111a86fb9ea788a9d85e1e6923a2227160dbb890f9767dd9156d396fe7d1307cb9445fd057c0342a DIST progressbar2-3.55.0.tar.gz 371356 BLAKE2B 89034af2cc623063e98c9de1683f159c2eeb491354c66357d9c3fb5a7ac0503b5c9d2dd6ebf36d3e2803558f3841820188eaf6dc931e992c352e0e02fa020f87 SHA512 16dcdffeba6e9cb6696ac41c16701874c5f314432332d7ae2d898d1040e603c428240a8ca5718789d0d431750e2ae923a6f63fe75785213e80494bcc5825aab5 diff --git a/dev-python/progressbar2/progressbar2-3.53.1.ebuild b/dev-python/progressbar2/progressbar2-3.53.1.ebuild deleted file mode 100644 index 8e572770470d..000000000000 --- a/dev-python/progressbar2/progressbar2-3.53.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} pypy3) -inherit distutils-r1 - -DESCRIPTION="Text progressbar library for python" -HOMEPAGE="https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~x86" - -RDEPEND=" - dev-python/python-utils[${PYTHON_USEDEP}] - !dev-python/progressbar -" -BDEPEND=" - test? ( dev-python/freezegun[${PYTHON_USEDEP}] )" - -distutils_enable_tests pytest - -src_prepare() { - sed -i -e '/cov/d' pytest.ini || die - default -} - -python_test() { - PYTHONDONTWRITEBYTECODE=1 epytest tests -} diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest index b23d0c566116..9a7327f0a0e5 100644 --- a/dev-python/sphinx/Manifest +++ b/dev-python/sphinx/Manifest @@ -1,3 +1,2 @@ DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125 -DIST Sphinx-4.1.2.tar.gz 6373677 BLAKE2B a78df4302520898c8708a75129baf28dd2dcde2dcbb4147d8246a2dd7907ae2af2ed8cf1d259ff1065dbe987fd918a7153831a9f5c16e79834c41f86b6031e41 SHA512 1fe998de7b8fc47989e186835748b7fb5d0b523db95434515b6af29b56d28372f2f92ab917c27cbed51aa0cad13175eda8bf4fc93a8726eb5e93e9bc6995e457 DIST Sphinx-4.2.0.tar.gz 6503692 BLAKE2B a3cc73c215be6859f285b92d651f2fe60f731340e7c003d3b275247593d1e641a25618817f67e7f3d8767724d6e98a6d63493bea340c7171e4e3da384da776e2 SHA512 6c6a2424362805b758c43136a9293dcfb02d45af6e6dc2dd7ed9382f6ae04ecfbd416efeecb42219b67d026a4a0b007500e87b20d81847ab48e2ccfcdca52e75 diff --git a/dev-python/sphinx/files/sphinx-4.1.2-py310.patch b/dev-python/sphinx/files/sphinx-4.1.2-py310.patch deleted file mode 100644 index 8c03d1f66721..000000000000 --- a/dev-python/sphinx/files/sphinx-4.1.2-py310.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 1fd5f746539d3e02886032fae8d53af0c2f6ecdd Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA <i.tkomiya@gmail.com> -Date: Fri, 30 Jul 2021 01:27:38 +0900 -Subject: [PATCH] Fix #9512: sphinx-build: crashed with the HEAD of Python 3.10 - -Recently, `types.Union` was renamed to `types.UnionType` on the HEAD -of 3.10 (refs: python/cpython#27342). After this change, sphinx-build -has been crashed because of ImportError. ---- - CHANGES | 2 ++ - sphinx/util/typing.py | 12 ++++++------ - 2 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/CHANGES b/CHANGES -index a643bfe841..70eb8db93a 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -16,6 +16,8 @@ Features added - Bugs fixed - ---------- - -+* #9512: sphinx-build: crashed with the HEAD of Python 3.10 -+ - Testing - -------- - -diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py -index f1723c035a..012d32e524 100644 ---- a/sphinx/util/typing.py -+++ b/sphinx/util/typing.py -@@ -33,10 +33,10 @@ def _evaluate(self, globalns: Dict, localns: Dict) -> Any: - ref = _ForwardRef(self.arg) - return ref._eval_type(globalns, localns) - --if sys.version_info > (3, 10): -- from types import Union as types_Union --else: -- types_Union = None -+try: -+ from types import UnionType # type: ignore # python 3.10 or above -+except ImportError: -+ UnionType = None - - if False: - # For type annotation -@@ -114,7 +114,7 @@ def restify(cls: Optional[Type]) -> str: - return ':class:`%s`' % INVALID_BUILTIN_CLASSES[cls] - elif inspect.isNewType(cls): - return ':class:`%s`' % cls.__name__ -- elif types_Union and isinstance(cls, types_Union): -+ elif UnionType and isinstance(cls, UnionType): - if len(cls.__args__) > 1 and None in cls.__args__: - args = ' | '.join(restify(a) for a in cls.__args__ if a) - return 'Optional[%s]' % args -@@ -337,7 +337,7 @@ def _stringify_py37(annotation: Any) -> str: - elif hasattr(annotation, '__origin__'): - # instantiated generic provided by a user - qualname = stringify(annotation.__origin__) -- elif types_Union and isinstance(annotation, types_Union): # types.Union (for py3.10+) -+ elif UnionType and isinstance(annotation, UnionType): # types.Union (for py3.10+) - qualname = 'types.Union' - else: - # we weren't able to extract the base type, appending arguments would diff --git a/dev-python/sphinx/sphinx-4.1.2.ebuild b/dev-python/sphinx/sphinx-4.1.2.ebuild deleted file mode 100644 index 03135e278977..000000000000 --- a/dev-python/sphinx/sphinx-4.1.2.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Python documentation generator" -HOMEPAGE="https://www.sphinx-doc.org/ - https://github.com/sphinx-doc/sphinx" -SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz" -S=${WORKDIR}/${P^} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc latex" - -RDEPEND=" - <dev-python/alabaster-0.8[${PYTHON_USEDEP}] - >=dev-python/Babel-1.3[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/imagesize[${PYTHON_USEDEP}] - >=dev-python/jinja-2.3[${PYTHON_USEDEP}] - >=dev-python/pygments-2.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.5.0[${PYTHON_USEDEP}] - >=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}] - >=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}] - >=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - latex? ( - dev-texlive/texlive-latexextra - dev-texlive/texlive-luatex - app-text/dvipng - )" -BDEPEND=" - doc? ( - dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}] - media-gfx/graphviz - ) - test? ( - dev-python/html5lib[${PYTHON_USEDEP}] - virtual/imagemagick-tools[jpeg,png,svg] - dev-texlive/texlive-fontsextra - dev-texlive/texlive-latexextra - dev-texlive/texlive-luatex - app-text/dvipng - )" - -PATCHES=( - "${FILESDIR}/${PN}-3.2.1-doc-link.patch" - # https://github.com/sphinx-doc/sphinx/commit/1fd5f746539d3e02886032fae8d53af0c2f6ecdd - "${FILESDIR}/${P}-py310.patch" -) - -distutils_enable_tests pytest - -python_prepare_all() { - # disable internet access - sed -i -e 's:^intersphinx_mapping:disabled_&:' \ - doc/conf.py || die - - # remove unnecessary upper bounds - sed -e '/Jinja2/s:,<3.0::' \ - -e '/MarkupSafe/s:<2.0::' \ - -i setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile - - # Generate the grammar. It will be caught by install somehow. - # Note that the tests usually do it for us. However, I don't want - # to trust USE=test really running all the tests, especially - # with FEATURES=test-fail-continue. - pushd "${BUILD_DIR}"/lib >/dev/null || die - "${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed." - popd >/dev/null || die -} - -python_compile_all() { - if use doc; then - esetup.py build_sphinx - HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. ) - fi -} - -python_test() { - mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die - local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir" - - local deselect=( - # these tests require Internet access - tests/test_build_latex.py::test_latex_images - tests/test_build_linkcheck.py::test_defaults - tests/test_build_linkcheck.py::test_defaults_json - tests/test_build_linkcheck.py::test_anchors_ignored - ) - [[ ${EPYTHON} == python3.10 ]] && deselect+=( - tests/test_ext_autodoc.py::test_enum_class - ) - [[ ${EPYTHON} == pypy3 ]] && deselect+=( - tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails - tests/test_ext_autodoc.py::test_autodoc_inherited_members_None - tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables - tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables - tests/test_ext_autodoc.py::test_automethod_for_builtin - tests/test_ext_autodoc.py::test_cython - tests/test_ext_autodoc.py::test_partialfunction - tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases - tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type - tests/test_ext_autodoc_autodata.py::test_autodata_type_comment - tests/test_ext_autodoc_autofunction.py::test_builtin_function - tests/test_ext_autodoc_autofunction.py::test_methoddescriptor - tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases - tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature - tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module - tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped - tests/test_pycode_parser.py::test_annotated_assignment - ) - - epytest ${deselect[@]/#/--deselect } -} |