diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /dev-python/setuptools | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'dev-python/setuptools')
-rw-r--r-- | dev-python/setuptools/Manifest | 15 | ||||
-rw-r--r-- | dev-python/setuptools/setuptools-40.6.3.ebuild | 4 | ||||
-rw-r--r-- | dev-python/setuptools/setuptools-41.5.1.ebuild | 86 | ||||
-rw-r--r-- | dev-python/setuptools/setuptools-42.0.1.ebuild | 90 | ||||
-rw-r--r-- | dev-python/setuptools/setuptools-42.0.2.ebuild | 31 | ||||
-rw-r--r-- | dev-python/setuptools/setuptools-44.0.0.ebuild (renamed from dev-python/setuptools/setuptools-9999.ebuild) | 14 | ||||
-rw-r--r-- | dev-python/setuptools/setuptools-45.0.0.ebuild (renamed from dev-python/setuptools/setuptools-42.0.0.ebuild) | 44 |
7 files changed, 36 insertions, 248 deletions
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 3a877f175302..1c50cee6f766 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,13 +1,10 @@ AUX setuptools-42.0.0-imp-fix.patch 1839 BLAKE2B a11f8fe053a4b0ad8d326be339ba9cc95e3b90441b8fdeb4ad589d8e8248abf63a11f97ff1917aea73d3f3daf054d9fa831e805ad6823f31d474e25d67e15eb9 SHA512 c93a5b24f0169ab64ba3c80aa9c64a70609d89c776ee491de3088dc6dc7149d709836f79affde03aa58e2065e014318182a2359bae753fbb47c98d05fa9bcab3 DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c -DIST setuptools-41.5.1.zip 851097 BLAKE2B 2411db77cffb24190c1510c7fab623ae0fb2a248994eae01e1a79427d35d8bf6a2f065de0d95dc11105df0bb42962a57c914486b48dc91115ec32e4dbcbc059d SHA512 eb6e944c80448873f8970477aaf474e75879e2b81b91fdc7a308670fed231d52880c3be3452e7ed3f094f20d4afe54b1db24ec4d98845ed47ee5e71dbf66261d -DIST setuptools-42.0.0.zip 852125 BLAKE2B b3cbba2eb97f7d6d0bb1a1d582c927680ada8d4589c4a196886f95cddd5b8c8b14fb5f0a2397ab7bcdc4ddd5fe6d4eddfab53bf9f43e0781a666f3d88efb8117 SHA512 d430605f8da3820b8d902d339b63bc382b9ec1bb0187385f792226bdfa8c191634df69881e1c43ffa8900599307d0ba202cfcb2d30df12d061f8220b9eae854a -DIST setuptools-42.0.1.zip 852264 BLAKE2B fac352a9d87245655f8183a8037552d454441ca5d18be60986d3d7883472a8be6af83614cb73896b76a251eadb09c1a67db9789ddbc5beb1dd9c3e1ddadd671a SHA512 d8eea952dc3cd925ddf3aaf059e9042dcb2684fd841446d92f309fcf8ad1869a380784d137006ca1b46ee539b4e1867e5b61eae80553295897df702966447232 DIST setuptools-42.0.2.zip 858444 BLAKE2B 2b77dbeeb9a3b4138810a96fe7ac0a7800717b4b68d6e9db2d146ca176127d5bfd5e4ef07adfa98758f8c4d05396152ca08e1707caf3d91703c7b268bd291f28 SHA512 ab623fd69b92111d3ab19a3ad9de9c07b4316f4130f3db4068a436d3c13c971d97506f7307c9f64d9cc9ca24a5f3800b68748455e70418d0c0cd240c93ebae35 -EBUILD setuptools-40.6.3.ebuild 2090 BLAKE2B 3d5b2b7f6793664885627b739f456aca0b5903fd9dc4af6604b2e3d9dbb40aab227c5f1619a47aec82759b9e0aa60214bf2ce27a4bdb8ff3631f24cd81a694b9 SHA512 ac07fdd5b84a305f16c1105ecce8288ab69c8c7032538cbf8bfec41ae3c4eaa7ef52706d7068d1135bc3e73b9be8d2a010bc9ac8397ebd4cb20921c7c9da290b -EBUILD setuptools-41.5.1.ebuild 2619 BLAKE2B 684e57f73715d975d9152a214b6b896f001be4274448ce8618abe4a0cb29f432dbd3b8add384a1a7419dfecd67c295cd0f6199abc6efc3439c622ece4a485757 SHA512 0f0a9a8b1e7faf816d51121103a65b2e9f20676e2a3417cab29e68c0c0557d3ec31244e771b9bb7f454e4d94539908af7a76e1b1f09c86ec6b0c9767263cb91d -EBUILD setuptools-42.0.0.ebuild 2767 BLAKE2B f04ab6f1810e19600eaceb55a991652a4fac4020a56d0ad1f4d7d092a09c59cff00034cab007afdd7774b74b2db10932ff8c3d36683f4cc81ef9b1f2f026af80 SHA512 28aa998f85729d19569161fadfd56a4a80b55bd8229bb0b2ead0ac7eef6735bd7a83e9241dd379ac5d322db3243b76ee80a5f1380eb2bb99889448cd6193818c -EBUILD setuptools-42.0.1.ebuild 2767 BLAKE2B da3518f4d491659e511749dabc8247c5271a3076054a6bfb622ffb68168daae439b702c298b6dac92132ec0a9c51e3ecdcd3d87ddc5720421330245d72c12677 SHA512 4ab7c7ba69b5b8fdcbb6e717c6ba470d31994b0baa6634be70291c13c7260f9c586e475caf3dcfda0ac671f0769ed7c65c325fcbd49833f6069dacfcef88c1eb -EBUILD setuptools-42.0.2.ebuild 2767 BLAKE2B 2a57c2994d54eec7b5f36b7ffb1f32a832cfc9c6549ac44d6a8c8be3a56ea2802de7c850ffe7f7d34f93d5ee7f00c9acf1a99281e1f20b627895c2c792dee93f SHA512 cb7de930f97de13a666097963ca39e342716e40d4e186b4a4dce40d37451dc2b64637304f812ba20d04ac3da4046beb27b080f5b8bb30964ee9afdb2be3265d9 -EBUILD setuptools-9999.ebuild 2080 BLAKE2B 173232a16d3d5fe048b479b021145045960224c4fff9ccafc84e9c7747c4d32cc6f7b1ebadcf399bf52a75db5614fcee32f6c30f26c1c9f6842b422be094bb07 SHA512 e64c7bc081d53057788661659218d82a788c949668bf95e6d4606587da5ab629560a667b39b696dd59f57dfc0906b6dfacd8c8bc5fb483f4b9d8c71a46235acd +DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa SHA512 bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1 +DIST setuptools-45.0.0.zip 859461 BLAKE2B 060cd64efb4ce67b931f5a5672222d2cb6e2bacb68edd50af5b14b8de95b5b9b7727b76b970084257ec9f3afdf4a7bf4acbc6223b6e355d033af3660dfe4f1aa SHA512 d912d093866dfcf7b0e22ba2df51ab0d366c52bd5796f0aedfa0b1848abc80a2e30035897b83bed08b67d9d7d0fce4b0c4981c2a80196b8637c19f34ec269645 +EBUILD setuptools-40.6.3.ebuild 2085 BLAKE2B afc2dc6270cdfee0e067ad34dac83b0284434ed79329cbb704191388485d4c5c5752e1f546d59e06477041f5ae92fb1b9c34786542deb4a90c7b563c084aa437 SHA512 33ac468d760f3a211b5fa60f3d7104f8ac22a90c94236aa686ca5d41d91229eae1022df90d2d92622fba184dd9d19ef2b3914a07a861dee0f41fe3f3a26aba96 +EBUILD setuptools-42.0.2.ebuild 2214 BLAKE2B 68e0af2f4b69c7b353fb788f00266c839ef74841b2b4770f386ba1d71359e959e93b5dc84221290ad869a4ee79080772ce3cc02799ad122a715538a0c9ac91cd SHA512 5575e21c05fb85c9ab95e1f3f2e8827ae7f0d7074a49abe981adfca1873aeb5bf2fc95fc30019ce553c0805409263707c5cc7ae43d4397aeb7d49e97ed489451 +EBUILD setuptools-44.0.0.ebuild 2223 BLAKE2B cc143e093bfc793aceff351f68b58fd3edb4597a28379f9347d43cd96eb7c55c3b0cf841c56391c3cd92968ab344552cd5806626ca4378d89d55b0588bec59a1 SHA512 8a3ef21926e9ecf6f78f4e56ff4c5b436121dce97046bbc66cef9c244403f5373b8f97e0c686959cc715edb2e2a72c5e7dc0bf0a4ddaa275e27e9248315dd9b9 +EBUILD setuptools-45.0.0.ebuild 2014 BLAKE2B 8a697c77ff7fac9c56ce3c6fc5c817c078bec067a65ba828dad2312da3f4a035aae543e66435f99de778b29c42c16583299da7c763994be2f938d3612b258ac2 SHA512 6e551124454d72c1f5b31db6b1d5fef86ebc4aae4dc4174fde7f559712e647be091643584e8d29639dda4b8c3e694b209e585f392d8c4bc798380d79155ce7eb MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94 diff --git a/dev-python/setuptools/setuptools-40.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild index a21883a89f89..94be23de816e 100644 --- a/dev-python/setuptools/setuptools-40.6.3.ebuild +++ b/dev-python/setuptools/setuptools-40.6.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) +PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) PYTHON_REQ_USE="xml(+)" inherit distutils-r1 diff --git a/dev-python/setuptools/setuptools-41.5.1.ebuild b/dev-python/setuptools/setuptools-41.5.1.ebuild deleted file mode 100644 index a7b9022b6a0c..000000000000 --- a/dev-python/setuptools/setuptools-41.5.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/pypa/setuptools.git" - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/" - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" -" -# Temporary hack to avoid py38 keywording hell. Please remove when -# the test deps all have py38. Also setuptools' test pass with py38, -# so you need to hack them all in locally before bumping and test. -TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3}) -DEPEND="${RDEPEND} - app-arch/unzip - test? ( - dev-python/mock[${TEST_USEDEP}] - dev-python/pip[${TEST_USEDEP}] - >=dev-python/pytest-3.7.0[${TEST_USEDEP}] - dev-python/pytest-fixture-config[${TEST_USEDEP}] - dev-python/pytest-virtualenv[${TEST_USEDEP}] - dev-python/wheel[${TEST_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - ) -" -PDEPEND=" - >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]" - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) - -python_prepare_all() { - if [[ ${PV} == "9999" ]]; then - python_setup - ${EPYTHON} bootstrap.py || die - fi - - # disable tests requiring a network connection - rm setuptools/tests/test_packageindex.py || die - - # don't run integration tests - rm setuptools/tests/test_integration.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - if [[ ${EPYTHON} == python3.8 ]]; then - if [[ ${PV} != 41.5.1 ]]; then - eerror "Please disable py38 hacks and test locally, then update this." - die "Python 3.8 support untested for ${PV}" - fi - einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps" - return - fi - - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}" -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -} diff --git a/dev-python/setuptools/setuptools-42.0.1.ebuild b/dev-python/setuptools/setuptools-42.0.1.ebuild deleted file mode 100644 index 58369bab16cb..000000000000 --- a/dev-python/setuptools/setuptools-42.0.1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/pypa/setuptools.git" - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/" - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -# Temporary hack to avoid py38 keywording hell. Please remove when -# the test deps all have py38. Also setuptools' test pass with py38, -# so you need to hack them all in locally before bumping and test. -TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3}) -BDEPEND=" - app-arch/unzip - test? ( - dev-python/mock[${TEST_USEDEP}] - dev-python/pip[${TEST_USEDEP}] - >=dev-python/pytest-3.7.0[${TEST_USEDEP}] - dev-python/pytest-fixture-config[${TEST_USEDEP}] - dev-python/pytest-virtualenv[${TEST_USEDEP}] - dev-python/wheel[${TEST_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - ) -" -PDEPEND=" - >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]" - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) - -PATCHES=( - # fix regression introduced by reinventing deprecated 'imp' - # https://github.com/pypa/setuptools/pull/1905 - "${FILESDIR}"/setuptools-42.0.0-imp-fix.patch -) - -python_prepare_all() { - if [[ ${PV} == "9999" ]]; then - python_setup - ${EPYTHON} bootstrap.py || die - fi - - # disable tests requiring a network connection - rm setuptools/tests/test_packageindex.py || die - - # don't run integration tests - rm setuptools/tests/test_integration.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - if [[ ${EPYTHON} == python3.8 ]]; then - if [[ ${PV} != 42.0.1 ]]; then - eerror "Please disable py38 hacks and test locally, then update this." - die "Python 3.8 support untested for ${PV}" - fi - einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps" - return - fi - - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}" -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -} diff --git a/dev-python/setuptools/setuptools-42.0.2.ebuild b/dev-python/setuptools/setuptools-42.0.2.ebuild index 98b924808219..e9fbfe3f93bf 100644 --- a/dev-python/setuptools/setuptools-42.0.2.ebuild +++ b/dev-python/setuptools/setuptools-42.0.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) +PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 ) PYTHON_REQ_USE="xml(+)" inherit distutils-r1 @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="Collection of extensions to Distutils" @@ -24,19 +24,15 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -# Temporary hack to avoid py38 keywording hell. Please remove when -# the test deps all have py38. Also setuptools' test pass with py38, -# so you need to hack them all in locally before bumping and test. -TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3}) BDEPEND=" app-arch/unzip test? ( - dev-python/mock[${TEST_USEDEP}] - dev-python/pip[${TEST_USEDEP}] - >=dev-python/pytest-3.7.0[${TEST_USEDEP}] - dev-python/pytest-fixture-config[${TEST_USEDEP}] - dev-python/pytest-virtualenv[${TEST_USEDEP}] - dev-python/wheel[${TEST_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] + dev-python/pytest-fixture-config[${PYTHON_USEDEP}] + dev-python/pytest-virtualenv[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] virtual/python-futures[${PYTHON_USEDEP}] ) " @@ -70,15 +66,6 @@ python_prepare_all() { } python_test() { - if [[ ${EPYTHON} == python3.8 ]]; then - if [[ ${PV} != 42.0.2 ]]; then - eerror "Please disable py38 hacks and test locally, then update this." - die "Python 3.8 support untested for ${PV}" - fi - einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps" - return - fi - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg # It tries to sandbox the test in a tempdir HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}" diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-44.0.0.ebuild index 34b0627c0728..7a3bb2682436 100644 --- a/dev-python/setuptools/setuptools-9999.ebuild +++ b/dev-python/setuptools/setuptools-44.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) +PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 ) PYTHON_REQ_USE="xml(+)" inherit distutils-r1 @@ -24,9 +24,7 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -RDEPEND=" -" -DEPEND="${RDEPEND} +BDEPEND=" app-arch/unzip test? ( dev-python/mock[${PYTHON_USEDEP}] @@ -46,6 +44,12 @@ DISTUTILS_IN_SOURCE_BUILD=1 DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) +PATCHES=( + # fix regression introduced by reinventing deprecated 'imp' + # https://github.com/pypa/setuptools/pull/1905 + "${FILESDIR}"/setuptools-42.0.0-imp-fix.patch +) + python_prepare_all() { if [[ ${PV} == "9999" ]]; then python_setup diff --git a/dev-python/setuptools/setuptools-42.0.0.ebuild b/dev-python/setuptools/setuptools-45.0.0.ebuild index 8c33401e75bd..b3c6db3ab76f 100644 --- a/dev-python/setuptools/setuptools-42.0.0.ebuild +++ b/dev-python/setuptools/setuptools-45.0.0.ebuild @@ -1,42 +1,32 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) +PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) PYTHON_REQ_USE="xml(+)" inherit distutils-r1 -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/pypa/setuptools.git" - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - DESCRIPTION="Collection of extensions to Distutils" HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" LICENSE="MIT" SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" -# Temporary hack to avoid py38 keywording hell. Please remove when -# the test deps all have py38. Also setuptools' test pass with py38, -# so you need to hack them all in locally before bumping and test. -TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3}) BDEPEND=" app-arch/unzip test? ( - dev-python/mock[${TEST_USEDEP}] - dev-python/pip[${TEST_USEDEP}] - >=dev-python/pytest-3.7.0[${TEST_USEDEP}] - dev-python/pytest-fixture-config[${TEST_USEDEP}] - dev-python/pytest-virtualenv[${TEST_USEDEP}] - dev-python/wheel[${TEST_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] + dev-python/pytest-fixture-config[${PYTHON_USEDEP}] + dev-python/pytest-virtualenv[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] virtual/python-futures[${PYTHON_USEDEP}] ) " @@ -55,11 +45,6 @@ PATCHES=( ) python_prepare_all() { - if [[ ${PV} == "9999" ]]; then - python_setup - ${EPYTHON} bootstrap.py || die - fi - # disable tests requiring a network connection rm setuptools/tests/test_packageindex.py || die @@ -70,15 +55,6 @@ python_prepare_all() { } python_test() { - if [[ ${EPYTHON} == python3.8 ]]; then - if [[ ${PV} != 42.0.0 ]]; then - eerror "Please disable py38 hacks and test locally, then update this." - die "Python 3.8 support untested for ${PV}" - fi - einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps" - return - fi - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg # It tries to sandbox the test in a tempdir HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}" |