diff options
Diffstat (limited to 'dev-python/setuptools')
-rw-r--r-- | dev-python/setuptools/Manifest | 10 | ||||
-rw-r--r-- | dev-python/setuptools/setuptools-71.0.4.ebuild | 2 | ||||
-rw-r--r-- | dev-python/setuptools/setuptools-71.1.0.ebuild (renamed from dev-python/setuptools/setuptools-70.3.0.ebuild) | 21 | ||||
-rw-r--r-- | dev-python/setuptools/setuptools-72.1.0.ebuild (renamed from dev-python/setuptools/setuptools-70.2.0-r1.ebuild) | 32 |
4 files changed, 17 insertions, 48 deletions
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 0f688841c871..a6898071a277 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,8 +1,8 @@ AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e -DIST setuptools-70.2.0.tar.gz 2332711 BLAKE2B d552e3c7fb8bad3829b6c210827af2a3993afa7c534502d08cb7f87df846f9939b75ce181217c673be7a0c71e81ede437b5f44cf9a42ff13133a9f922e426c1d SHA512 a2b0aaf57d012326475ee7637e65ebbc3b1a09b338850e8b0c6a0f169c49651f934c813d6d347ba1ff04894a4d8341bb5fedbea35d45dbc19f317587bbb35094 -DIST setuptools-70.3.0.tar.gz 2333112 BLAKE2B cffe583c1440e2c6ed049fc0c3da70d6b3f43710cec8eeba9b96906d7d3113c0156ac0398f12355e2c0eeeb73dc351e56eea117361c83a4819e255f2b44d01da SHA512 9f330bd9867631da69ee0886551033a6e8ef3cf52cfe38aad9fcd359cbfc2e0d7ee8c85382b29f8d52568c674893dc07f2b2a896afe5154e6140bb3209ee50a0 DIST setuptools-71.0.4.tar.gz 2421868 BLAKE2B 29c63bedd87dd4c79ef86d20b6ab4297ae434a59d412813d0ef136c6239b8c77c7ec81b8384319a0e18617d0f8417da3c28d9f8ece40f4509949611c575c35a2 SHA512 efd1996e2720244b8bb385682258be4b2cd67d18b0910aa3f32c23907fad998144ff47455fb8866298e2b879b714624d09efefdcf1bf1d55047ecd3d1e36548e -EBUILD setuptools-70.2.0-r1.ebuild 5234 BLAKE2B df78be2b44768698507ab5f4a0bc60d67d91e7373104866c3d19b70f0d9f300724e9128d91cae8f36246fa6828b4d7f1bc4560546a36603fd512068cb78f6761 SHA512 0910ccc4b2ae52a53c7203e8565e2d62bdd239afea53553619fdda7887313a5069e091fee5f4543794dc19f19a327222f36ff57de7e50d9a6e02bee9030541d0 -EBUILD setuptools-70.3.0.ebuild 4975 BLAKE2B a8d45fb1fc9d629db9889856dec886e7b595284e8e0e33272c893a67b35594beb0023c08d2590078d5327ca0e852228d2f9b52882336d1ded5f2d17a67e34c6a SHA512 f18b1664bcd2ff9e1874952e6f265841bb47278ed6c678a5d474b96c1e9c0cc94268bce1f3299abc4c4ca8c497d95f45cfedd905cdeeada01fd59ed3c6f74757 -EBUILD setuptools-71.0.4.ebuild 4269 BLAKE2B 78e7fe35b750972505bc2c377a1dedaa14f70d5760678ccfa85d2dc6fc5d52784fe3fd9dba0e9c911cd0eca452947a75772774430f124f131619ccac828efe9b SHA512 88cdd454acf31fa539f5ba486c2a7a4bc8a43cf9364e08fd81ad9337d3725bf651bec5102171f05b7c00dac3f8ddd0af944941ed05f4726d96c6decb482a1452 +DIST setuptools-71.1.0.tar.gz 2422233 BLAKE2B b98bc2155cdf5acabd52c942a8b7908dbb48b39a3abbf065e42b089e22c3bba27aeee3492c5ecfc1de8b4bdba3c97259cfc609a31cdc11cdaf23f9a2dbab8685 SHA512 2cb817d3dee790ab1e71739b3980361c6dface44fa9c027a92aa3f96e758c034b0330de5eae48365dfa17933fe050f8418cff23fea192b3c616789215e411c1a +DIST setuptools-72.1.0.tar.gz 2419487 BLAKE2B df05affc48f8909b6b3b9dc30ef33e31c4b3781e747fea7d23b855d0294976f563e25b268666bfd2c758be66eca00e3e850463ff3d6f26b891185a2a15c8d31c SHA512 d0a34f16dfa6bb9a6df39076cd43528cf854d343f6f801c448ea0ebab2a259aec3d03571e2a26709df6082ed2fcb6c43b86448be556fd559b6af41831b4f38e0 +EBUILD setuptools-71.0.4.ebuild 4261 BLAKE2B 5211e0e5aa791afcc0d700964638ba793e5c5fe507a036dbad025dda8f3905575b92d472ba0db77ae43ddd5c6cb86cba877275a7b7ca8322ad095294053cc125 SHA512 2989175c52bd37682d09c333883ca57dd92b1b40ccaf755fc820c6f31cf8d503f2846a965ec8cc94e420facee4930b9395083a34e5536b146a5d86534d6d2ad9 +EBUILD setuptools-71.1.0.ebuild 4269 BLAKE2B 78e7fe35b750972505bc2c377a1dedaa14f70d5760678ccfa85d2dc6fc5d52784fe3fd9dba0e9c911cd0eca452947a75772774430f124f131619ccac828efe9b SHA512 88cdd454acf31fa539f5ba486c2a7a4bc8a43cf9364e08fd81ad9337d3725bf651bec5102171f05b7c00dac3f8ddd0af944941ed05f4726d96c6decb482a1452 +EBUILD setuptools-72.1.0.ebuild 4269 BLAKE2B 78e7fe35b750972505bc2c377a1dedaa14f70d5760678ccfa85d2dc6fc5d52784fe3fd9dba0e9c911cd0eca452947a75772774430f124f131619ccac828efe9b SHA512 88cdd454acf31fa539f5ba486c2a7a4bc8a43cf9364e08fd81ad9337d3725bf651bec5102171f05b7c00dac3f8ddd0af944941ed05f4726d96c6decb482a1452 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319 diff --git a/dev-python/setuptools/setuptools-71.0.4.ebuild b/dev-python/setuptools/setuptools-71.0.4.ebuild index d4a49d945688..54bceb617bc6 100644 --- a/dev-python/setuptools/setuptools-71.0.4.ebuild +++ b/dev-python/setuptools/setuptools-71.0.4.ebuild @@ -21,7 +21,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/setuptools/setuptools-70.3.0.ebuild b/dev-python/setuptools/setuptools-71.1.0.ebuild index 4a159eeb5974..d4a49d945688 100644 --- a/dev-python/setuptools/setuptools-70.3.0.ebuild +++ b/dev-python/setuptools/setuptools-71.1.0.ebuild @@ -25,7 +25,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~ IUSE="test" RESTRICT="!test? ( test )" -# check */_vendor/vendored.txt RDEPEND=" !!<dev-python/setuptools-rust-1.8.0 >=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}] @@ -87,10 +86,7 @@ src_prepare() { # remove bundled dependencies rm -r */_vendor setuptools/_distutils/_vendor || die - # remove the ugly */extern hack that breaks on unvendored deps - rm -r */extern || die find -name '*.py' -exec sed \ - -e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \ -e 's:from [.]_vendor[.]:from :' \ -i {} + || die } @@ -102,20 +98,14 @@ python_test() { local EPYTEST_DESELECT=( # network - # TODO: see if PRE_BUILT_SETUPTOOLS_* helps - setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg - setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist setuptools/tests/test_build_meta.py::test_legacy_editable_install setuptools/tests/test_distutils_adoption.py setuptools/tests/test_editable_install.py - setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests - setuptools/tests/test_virtualenv.py::test_clean_env_install setuptools/tests/test_virtualenv.py::test_no_missing_dependencies setuptools/tests/test_virtualenv.py::test_test_command_install_requirements # TODO setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors - setuptools/tests/test_extern.py::test_distribution_picklable # expects bundled deps in virtualenv setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel @@ -123,13 +113,12 @@ python_test() { setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts # TODO, probably some random package setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass - # Internet, sigh - setuptools/tests/test_integration.py - # flaky - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_transitive_extra_dependency - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_distutils_command_dep + # broken by unbundling + setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata ) local EPYTEST_XDIST=1 - epytest -o tmp_path_retention_policy=all setuptools + local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH} + epytest -o tmp_path_retention_policy=all \ + -m "not uses_network" setuptools } diff --git a/dev-python/setuptools/setuptools-70.2.0-r1.ebuild b/dev-python/setuptools/setuptools-72.1.0.ebuild index 6158743ccf66..d4a49d945688 100644 --- a/dev-python/setuptools/setuptools-70.2.0-r1.ebuild +++ b/dev-python/setuptools/setuptools-72.1.0.ebuild @@ -21,11 +21,10 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" -# check */_vendor/vendored.txt RDEPEND=" !!<dev-python/setuptools-rust-1.8.0 >=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}] @@ -87,10 +86,7 @@ src_prepare() { # remove bundled dependencies rm -r */_vendor setuptools/_distutils/_vendor || die - # remove the ugly */extern hack that breaks on unvendored deps - rm -r */extern || die find -name '*.py' -exec sed \ - -e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \ -e 's:from [.]_vendor[.]:from :' \ -i {} + || die } @@ -102,20 +98,14 @@ python_test() { local EPYTEST_DESELECT=( # network - # TODO: see if PRE_BUILT_SETUPTOOLS_* helps - setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg - setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist setuptools/tests/test_build_meta.py::test_legacy_editable_install setuptools/tests/test_distutils_adoption.py setuptools/tests/test_editable_install.py - setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests - setuptools/tests/test_virtualenv.py::test_clean_env_install setuptools/tests/test_virtualenv.py::test_no_missing_dependencies setuptools/tests/test_virtualenv.py::test_test_command_install_requirements # TODO setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors - setuptools/tests/test_extern.py::test_distribution_picklable # expects bundled deps in virtualenv setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel @@ -123,22 +113,12 @@ python_test() { setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts # TODO, probably some random package setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass - # Internet, sigh - setuptools/tests/test_integration.py - # flaky - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_transitive_extra_dependency - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_distutils_command_dep + # broken by unbundling + setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata ) - case ${EPYTHON} in - python3.12) - EPYTEST_DESELECT+=( - # TODO - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_distutils_command_dep - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_transitive_extra_dependency - ) - esac - local EPYTEST_XDIST=1 - epytest -o tmp_path_retention_policy=all setuptools + local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH} + epytest -o tmp_path_retention_policy=all \ + -m "not uses_network" setuptools } |