From 08c5e4df7a4b66ba8dbb827ca2e3a973d4f19ab0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 17 Jan 2024 20:06:58 +0000 Subject: gentoo auto-resync : 17:01:2024 - 20:06:58 --- dev-python/Manifest.gz | Bin 269290 -> 269297 bytes dev-python/Nuitka/Manifest | 6 +- dev-python/Nuitka/Nuitka-1.9.5.ebuild | 4 +- dev-python/Nuitka/Nuitka-1.9.6.ebuild | 4 +- dev-python/Nuitka/Nuitka-1.9.7.ebuild | 2 +- dev-python/nautilus-python/Manifest | 2 +- .../nautilus-python/nautilus-python-4.0.ebuild | 6 +- dev-python/pip/Manifest | 3 +- .../pip/files/pip-23.3.2-setuptools-69.0.3.patch | 383 +++++++++++++++++++++ dev-python/pip/pip-23.3.2-r1.ebuild | 134 +++++++ dev-python/pip/pip-23.3.2.ebuild | 131 ------- dev-python/python-caja/Manifest | 2 +- dev-python/python-caja/python-caja-1.26.0.ebuild | 6 +- 13 files changed, 535 insertions(+), 148 deletions(-) create mode 100644 dev-python/pip/files/pip-23.3.2-setuptools-69.0.3.patch create mode 100644 dev-python/pip/pip-23.3.2-r1.ebuild delete mode 100644 dev-python/pip/pip-23.3.2.ebuild (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 0382be42302c..fa3e064835d2 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest index daa0a94b5123..b0bf4ec0c637 100644 --- a/dev-python/Nuitka/Manifest +++ b/dev-python/Nuitka/Manifest @@ -1,7 +1,7 @@ DIST Nuitka-1.9.5.tar.gz 3911838 BLAKE2B 064ad4aa48d94b4eb7c886d445e7228c72d03dcb22e75e82a7c43b42a20a32f1b11855017f72101e54c45b4591ffd2af0912191eb7f13367f16726208308a6de SHA512 8b8bc0ec0f4666ae63bd4cb3463c6321bd1cbde7a64ca37d500bd2e60d50f6a13aca5dc89a101d7b8e39622e21091b24232ecf8361b4ae9a9913c187742c7607 DIST Nuitka-1.9.6.tar.gz 3914776 BLAKE2B 82a50f642f8b93caa725bbfffa6236d490ccb8d731ea917886d0cde03aa6c2237f6c8ff7687ad3140c985cc7c5b525e16aaf07bd604232e32b7fa0fb102a00f5 SHA512 005be29f72685677da1e037b36381765c1248bc2940eb92a46e8e5df990f0241af831b8cf28ab2957d3a7d3d0cb03c2b99ab5af4e900afba53b5ac60e95d1a24 DIST Nuitka-1.9.7.tar.gz 3916330 BLAKE2B df269672d0c7b860a0aebf0cd9f321442344c69e1ea8ccaad193a835b11ca6cfe048179d3ab03a616525aa022327e168c48406c733354ed13c07c49e26cb0bb8 SHA512 71ce5ef929489ce7a72a2b62b7106dee35380b0d185788e105044cab6448d9c3470e3d783c71a9796404038b8035019816553a360a62d868cfc870675b3bb384 -EBUILD Nuitka-1.9.5.ebuild 1115 BLAKE2B 71600bcba8ba9422125dc6e145f919853e241a089aa855beb488ccb72bd3d5490ad4b986e1616dc4ac099023d88ee1fcbaf7efd5a84ad1f74ce17672efc7fff7 SHA512 28485d128e06c298f4aa512cf455dd38fe6dc34dce424246bb8bc69d531274158e377631b96c82cccea29a03492721a2bb71791ad2bbb4765475972347ea18ab -EBUILD Nuitka-1.9.6.ebuild 1115 BLAKE2B 71600bcba8ba9422125dc6e145f919853e241a089aa855beb488ccb72bd3d5490ad4b986e1616dc4ac099023d88ee1fcbaf7efd5a84ad1f74ce17672efc7fff7 SHA512 28485d128e06c298f4aa512cf455dd38fe6dc34dce424246bb8bc69d531274158e377631b96c82cccea29a03492721a2bb71791ad2bbb4765475972347ea18ab -EBUILD Nuitka-1.9.7.ebuild 1115 BLAKE2B 3348a3c3ddb788d8bd8dd55fb63ccc72340cc63e4f1e3265e92abb2e84fc50dc36d34cb95bf0c143775ff27b3104f2a9b5fc06c712cc7b0a850d6b66f65d7c85 SHA512 8044ca9ef3dfb6b1ce9c49f08a75219263a5bad3766e9f11ef80aa71114124bf5ab04121e72f90acb9998dff866e54ef73aa0b1e43b0270dea804e84ae61d899 +EBUILD Nuitka-1.9.5.ebuild 1116 BLAKE2B 705278b91c7a8e5e7cdce1f9d738fbc743e4c82eb8aad85dfbc4bd1ce8f00fba5b13eaef019c82b28c3e1c1f6f40ff04c20896d98b09fc2f56cac4d892bc30cd SHA512 2f286f299cddb0736a245786b36c1df800dde817eccc7b6b96213b3317e1b0d5aedc620319651780cfb12bfe60a74f22da647b713c07c9c4905b4de8959ebfba +EBUILD Nuitka-1.9.6.ebuild 1116 BLAKE2B 705278b91c7a8e5e7cdce1f9d738fbc743e4c82eb8aad85dfbc4bd1ce8f00fba5b13eaef019c82b28c3e1c1f6f40ff04c20896d98b09fc2f56cac4d892bc30cd SHA512 2f286f299cddb0736a245786b36c1df800dde817eccc7b6b96213b3317e1b0d5aedc620319651780cfb12bfe60a74f22da647b713c07c9c4905b4de8959ebfba +EBUILD Nuitka-1.9.7.ebuild 1116 BLAKE2B 705278b91c7a8e5e7cdce1f9d738fbc743e4c82eb8aad85dfbc4bd1ce8f00fba5b13eaef019c82b28c3e1c1f6f40ff04c20896d98b09fc2f56cac4d892bc30cd SHA512 2f286f299cddb0736a245786b36c1df800dde817eccc7b6b96213b3317e1b0d5aedc620319651780cfb12bfe60a74f22da647b713c07c9c4905b4de8959ebfba MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9 diff --git a/dev-python/Nuitka/Nuitka-1.9.5.ebuild b/dev-python/Nuitka/Nuitka-1.9.5.ebuild index f511685d5ce1..d7f62560068e 100644 --- a/dev-python/Nuitka/Nuitka-1.9.5.ebuild +++ b/dev-python/Nuitka/Nuitka-1.9.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - dev-util/scons[${PYTHON_USEDEP}] + dev-build/scons[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} diff --git a/dev-python/Nuitka/Nuitka-1.9.6.ebuild b/dev-python/Nuitka/Nuitka-1.9.6.ebuild index f511685d5ce1..d7f62560068e 100644 --- a/dev-python/Nuitka/Nuitka-1.9.6.ebuild +++ b/dev-python/Nuitka/Nuitka-1.9.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - dev-util/scons[${PYTHON_USEDEP}] + dev-build/scons[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} diff --git a/dev-python/Nuitka/Nuitka-1.9.7.ebuild b/dev-python/Nuitka/Nuitka-1.9.7.ebuild index 55247b1bdeb0..d7f62560068e 100644 --- a/dev-python/Nuitka/Nuitka-1.9.7.ebuild +++ b/dev-python/Nuitka/Nuitka-1.9.7.ebuild @@ -23,7 +23,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - dev-util/scons[${PYTHON_USEDEP}] + dev-build/scons[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest index eac8dc51c7b9..87f61bfad160 100644 --- a/dev-python/nautilus-python/Manifest +++ b/dev-python/nautilus-python/Manifest @@ -1,3 +1,3 @@ DIST nautilus-python-4.0.tar.xz 32184 BLAKE2B cc910de82e54cd687d23541a0b283a70dc5a0626acebf8787110ae1b5a4c080741c0879968816e217a4da968a77169d79b6614dd055f1ae57999a9a49f2553cb SHA512 f70f825b821f266caafd1b347066de01462b8256ec126072042d09dd7fd6c9324847d5ddab65671589d0a411f8b8fed428dbc94806ac679d646861c66c3a0dd5 -EBUILD nautilus-python-4.0.ebuild 1179 BLAKE2B 5559127364ff703a25bbfd9ccac3f2892426b3b5cfdc2e79e585bac74165383687666915632b8c13553f106f036c4cf3785325ea203a6177ed46e60bedd861ce SHA512 5fd84bdabd83d7442de75bd24cb0097cd0020168305a164fae452fa077c8258040c67a78f1f134a8b66b28c6e5a2988b2e5ec3cc10d4b739f744aaeb645fabcf +EBUILD nautilus-python-4.0.ebuild 1181 BLAKE2B 664452ddf6157efed3504320336839e15d435d9c71016c5e6627f2d10a7db94ac5e042e932a25f0e6b044bbb6896c504460c80482f9d641949c9633e780d62a6 SHA512 416073aaa28ef0a729a706f700f3f24d7efa8048af7fce8800aea54f7d237d61f2a57855202ca0f696bcade9038973970ec241734398b2a3da7454af70c1f357 MISC metadata.xml 356 BLAKE2B faf70d4fbe0451757ccedb3d4c316fd8d4528adc79a559eabb3e8e55e026729d20bcef8113d35d3c0e6f4c17ba36eeae4230cff1876f5c8c2d4ce9a4ba0f9881 SHA512 a17c4dbc5f2f06617086a7b5a9c82eede6236cca667f5fe765ece5eaaba9a909aec03234bd93cab339c0449465df41aade9ac4176a70ab95218485fdf4705a72 diff --git a/dev-python/nautilus-python/nautilus-python-4.0.ebuild b/dev-python/nautilus-python/nautilus-python-4.0.ebuild index e9df668a4bf0..c1ad210507d8 100644 --- a/dev-python/nautilus-python/nautilus-python-4.0.ebuild +++ b/dev-python/nautilus-python/nautilus-python-4.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit gnome2 meson python-single-r1 @@ -29,7 +29,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" gtk-doc? ( dev-util/gtk-doc ) - >=dev-util/gtk-doc-am-1.14 + >=dev-build/gtk-doc-am-1.14 virtual/pkgconfig " diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index c2e6ac192707..4dbfa06e57e3 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,5 +1,6 @@ AUX pip-23.1-no-coverage.patch 1836 BLAKE2B f8c95ed26d5a7cba2a516b8d134ddd9901fd7d39dc8bf174397ab2afab33e93c4af342195b5b4d7b0aedc642493f1ed2ee474c74e16e285f335dcdcf531b1777 SHA512 c63929cc5324b2a741a4c1ebb4990c376eb6a4c0f39370e456b674ce3cfbdf10471ec48cf9368fccba9264fd9d4a5667988116163e73772496f28d52986ff111 AUX pip-23.3.1-no-color.patch 1767 BLAKE2B b81a4b814e2e84e7c0424870d1a86ba7fde91400bfad127c696112544b294623ba9d580f503f01a8399a569a9a5880d38d1d09c98b9364c9b59915adb3a9b453 SHA512 c89be77fbd8049a1e6fd12ef4227926ff641c1797f91bbe91b6152016a1e7dff5e323d8ff0961948225ef854d52de972f74c8e37f48e8aee78e529f9ec8b3b3f +AUX pip-23.3.2-setuptools-69.0.3.patch 15433 BLAKE2B 9240c660580d595a182e6082446b7275c7f7b918589f731215a30b326a962668710a4aaa57877ccbeb48912a76182df9b2eb44e0868cff41e83326bd30273263 SHA512 952c30c62517eb0e60c7798d5a18fb20fe91e92816b552772a9334ed6f55d53b08f68c29c9eed30f59ce8265ce01eba8b28ea1f94c329c912f61f7afbaa2bff7 DIST pip-23.3.2.gh.tar.gz 9397451 BLAKE2B 65e656cf3e7c3ab48b5cfa48f105cae158068f3daee497edfb93e34887afa134b2cfea73574947ca22ec2664dd814034166301fb0f70322ca92852a68052be40 SHA512 976c6ab9959805f4d20d4bdedb4dabc95dd55f1ec78773f63f738599bbe44e766ad3a1394bee052a2c2386826d67686ad456726373345ba9e0d555fd251dff09 -EBUILD pip-23.3.2.ebuild 4257 BLAKE2B 2571d1af8e66e2737fc537c2657af1fbcd2f5d8f7f8a91439b1184a2363d2372de4b921b08a479347e2dc90f0f929d81d0ec4ade96b782bfbfdefa6e3aee8594 SHA512 35ff231ab4002b02fae043e3e2f8267f02820b6c63d5ebc7c78e28101b72cb63c436726c272027ffb80ab04eaf11304203919c1f572902a913b8262c5810691c +EBUILD pip-23.3.2-r1.ebuild 4330 BLAKE2B 5cc4dfd26bb1df712b6099df54e9871c0b3e65c4ca57b2c864d1fb18821d0a69de4a53335cbbf8938f8cd5d4a587471bf1ac1d52276940e4189eb51ae18ba651 SHA512 6c75f4c7190ad43571250300782da6e1835f37841ba47d1510daf5e213670ff7e9c97f5377384d04603e2d44ccba1d29fc7c86269e6b353e2e3899614a493e68 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9 diff --git a/dev-python/pip/files/pip-23.3.2-setuptools-69.0.3.patch b/dev-python/pip/files/pip-23.3.2-setuptools-69.0.3.patch new file mode 100644 index 000000000000..26d358da9534 --- /dev/null +++ b/dev-python/pip/files/pip-23.3.2-setuptools-69.0.3.patch @@ -0,0 +1,383 @@ +From a11f98c107cae60c82c480d3208c34656a22fa19 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= +Date: Sun, 14 Jan 2024 12:54:21 +0100 +Subject: [PATCH 1/2] Change .egg-link search algorithm to support setuptools + >= 69 + +--- + src/pip/_internal/utils/egg_link.py | 28 ++++++++++++++++++---------- + 1 file changed, 18 insertions(+), 10 deletions(-) + +diff --git a/src/pip/_internal/utils/egg_link.py b/src/pip/_internal/utils/egg_link.py +index eb57ed151..4a384a636 100644 +--- a/src/pip/_internal/utils/egg_link.py ++++ b/src/pip/_internal/utils/egg_link.py +@@ -15,24 +15,31 @@ __all__ = [ + ] + + +-def _egg_link_name(raw_name: str) -> str: ++def _egg_link_names(raw_name: str) -> List[str]: + """ + Convert a Name metadata value to a .egg-link name, by applying + the same substitution as pkg_resources's safe_name function. + Note: we cannot use canonicalize_name because it has a different logic. ++ ++ We also look for the raw name (without normalization) as setuptools 69 changed ++ the way it names .egg-link files (https://github.com/pypa/setuptools/issues/4167). + """ +- return re.sub("[^A-Za-z0-9.]+", "-", raw_name) + ".egg-link" ++ return [ ++ re.sub("[^A-Za-z0-9.]+", "-", raw_name) + ".egg-link", ++ f"{raw_name}.egg-link", ++ ] + + + def egg_link_path_from_sys_path(raw_name: str) -> Optional[str]: + """ + Look for a .egg-link file for project name, by walking sys.path. + """ +- egg_link_name = _egg_link_name(raw_name) ++ egg_link_names = _egg_link_names(raw_name) + for path_item in sys.path: +- egg_link = os.path.join(path_item, egg_link_name) +- if os.path.isfile(egg_link): +- return egg_link ++ for egg_link_name in egg_link_names: ++ egg_link = os.path.join(path_item, egg_link_name) ++ if os.path.isfile(egg_link): ++ return egg_link + return None + + +@@ -64,9 +71,10 @@ def egg_link_path_from_location(raw_name: str) -> Optional[str]: + sites.append(user_site) + sites.append(site_packages) + +- egg_link_name = _egg_link_name(raw_name) ++ egg_link_names = _egg_link_names(raw_name) + for site in sites: +- egglink = os.path.join(site, egg_link_name) +- if os.path.isfile(egglink): +- return egglink ++ for egg_link_name in egg_link_names: ++ egglink = os.path.join(site, egg_link_name) ++ if os.path.isfile(egglink): ++ return egglink + return None +-- +2.43.0 + +From 6fdd838c59d92ea435766f452da515f234a438ed Mon Sep 17 00:00:00 2001 +From: Richard Si +Date: Mon, 1 Jan 2024 17:19:45 -0500 +Subject: [PATCH 2/2] Fix tests broken by Setuptools 69.0.3 which now preserves + underscores in egg_info + +More test suite fixes for setuptools 69 compatibility +--- + tests/functional/test_check.py | 20 ++++++++++++--- + tests/functional/test_freeze.py | 22 +++++++---------- + tests/functional/test_install.py | 2 +- + tests/functional/test_install_reqs.py | 2 +- + tests/functional/test_install_vcs_git.py | 2 +- + tests/functional/test_new_resolver.py | 13 +++++++--- + tests/functional/test_show.py | 19 ++++++++++++--- + tests/lib/__init__.py | 31 ++++++++++++++++++------ + 8 files changed, 75 insertions(+), 36 deletions(-) + +diff --git a/tests/functional/test_check.py b/tests/functional/test_check.py +index e2b1c60ef..79b6df39c 100644 +--- a/tests/functional/test_check.py ++++ b/tests/functional/test_check.py +@@ -119,7 +119,10 @@ def test_check_complicated_name_missing(script: PipTestEnvironment) -> None: + + # Without dependency + result = script.pip("install", "--no-index", package_a_path, "--no-deps") +- assert "Successfully installed package-A-1.0" in result.stdout, str(result) ++ assert ( ++ "Successfully installed package_A-1.0" in result.stdout ++ or "Successfully installed package-A-1.0" in result.stdout ++ ), str(result) + + result = script.pip("check", expect_error=True) + expected_lines = ("package-a 1.0 requires dependency-b, which is not installed.",) +@@ -142,7 +145,10 @@ def test_check_complicated_name_broken(script: PipTestEnvironment) -> None: + + # With broken dependency + result = script.pip("install", "--no-index", package_a_path, "--no-deps") +- assert "Successfully installed package-A-1.0" in result.stdout, str(result) ++ assert ( ++ "Successfully installed package_A-1.0" in result.stdout ++ or "Successfully installed package-A-1.0" in result.stdout ++ ), str(result) + + result = script.pip( + "install", +@@ -175,7 +181,10 @@ def test_check_complicated_name_clean(script: PipTestEnvironment) -> None: + ) + + result = script.pip("install", "--no-index", package_a_path, "--no-deps") +- assert "Successfully installed package-A-1.0" in result.stdout, str(result) ++ assert ( ++ "Successfully installed package_A-1.0" in result.stdout ++ or "Successfully installed package-A-1.0" in result.stdout ++ ), str(result) + + result = script.pip( + "install", +@@ -203,7 +212,10 @@ def test_check_considers_conditional_reqs(script: PipTestEnvironment) -> None: + ) + + result = script.pip("install", "--no-index", package_a_path, "--no-deps") +- assert "Successfully installed package-A-1.0" in result.stdout, str(result) ++ assert ( ++ "Successfully installed package_A-1.0" in result.stdout ++ or "Successfully installed package-A-1.0" in result.stdout ++ ), str(result) + + result = script.pip("check", expect_error=True) + expected_lines = ("package-a 1.0 requires dependency-b, which is not installed.",) +diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py +index 9a5937df3..a8e6c038c 100644 +--- a/tests/functional/test_freeze.py ++++ b/tests/functional/test_freeze.py +@@ -221,12 +221,10 @@ def test_freeze_editable_not_vcs(script: PipTestEnvironment) -> None: + # We need to apply os.path.normcase() to the path since that is what + # the freeze code does. + expected = textwrap.dedent( +- """\ +- ...# Editable install with no version control (version-pkg==0.1) +- -e {} +- ...""".format( +- os.path.normcase(pkg_path) +- ) ++ f"""\ ++ ...# Editable install with no version control (version...pkg==0.1) ++ -e {os.path.normcase(pkg_path)} ++ ...""" + ) + _check_output(result.stdout, expected) + +@@ -248,12 +246,10 @@ def test_freeze_editable_git_with_no_remote( + # We need to apply os.path.normcase() to the path since that is what + # the freeze code does. + expected = textwrap.dedent( +- """\ +- ...# Editable Git install with no remote (version-pkg==0.1) +- -e {} +- ...""".format( +- os.path.normcase(pkg_path) +- ) ++ f"""\ ++ ...# Editable Git install with no remote (version...pkg==0.1) ++ -e {os.path.normcase(pkg_path)} ++ ...""" + ) + _check_output(result.stdout, expected) + +@@ -489,7 +485,7 @@ def test_freeze_git_remote(script: PipTestEnvironment) -> None: + expected = os.path.normcase( + textwrap.dedent( + f""" +- ...# Editable Git...(version-pkg...)... ++ ...# Editable Git...(version...pkg...)... + # '{other_remote}' + -e {repo_dir}... + """ +diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py +index 140061a17..4b0a4abdf 100644 +--- a/tests/functional/test_install.py ++++ b/tests/functional/test_install.py +@@ -358,7 +358,7 @@ def test_basic_install_editable_from_svn(script: PipTestEnvironment) -> None: + checkout_path = _create_test_package(script.scratch_path) + repo_url = _create_svn_repo(script.scratch_path, checkout_path) + result = script.pip("install", "-e", "svn+" + repo_url + "#egg=version-pkg") +- result.assert_installed("version-pkg", with_files=[".svn"]) ++ result.assert_installed("version_pkg", with_files=[".svn"]) + + + def _test_install_editable_from_git(script: PipTestEnvironment) -> None: +diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py +index f649be000..4e3b3e653 100644 +--- a/tests/functional/test_install_reqs.py ++++ b/tests/functional/test_install_reqs.py +@@ -300,7 +300,7 @@ def test_install_local_editable_with_subdirectory(script: PipTestEnvironment) -> + ), + ) + +- result.assert_installed("version-subpkg", sub_dir="version_subdir") ++ result.assert_installed("version_subpkg", sub_dir="version_subdir") + + + @pytest.mark.network +diff --git a/tests/functional/test_install_vcs_git.py b/tests/functional/test_install_vcs_git.py +index 2abc7aa0f..e59b269a6 100644 +--- a/tests/functional/test_install_vcs_git.py ++++ b/tests/functional/test_install_vcs_git.py +@@ -449,7 +449,7 @@ def test_git_with_ambiguous_revs(script: PipTestEnvironment) -> None: + assert "Could not find a tag or branch" not in result.stdout + # it is 'version-pkg' instead of 'version_pkg' because + # egg-link name is version-pkg.egg-link because it is a single .py module +- result.assert_installed("version-pkg", with_files=[".git"]) ++ result.assert_installed("version_pkg", with_files=[".git"]) + + + def test_editable__no_revision(script: PipTestEnvironment) -> None: +diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py +index feae58a9c..c0abec686 100644 +--- a/tests/functional/test_new_resolver.py ++++ b/tests/functional/test_new_resolver.py +@@ -5,6 +5,7 @@ import textwrap + from typing import TYPE_CHECKING, Callable, Dict, List, Tuple + + import pytest ++from packaging.utils import canonicalize_name + + from tests.conftest import ScriptFactory + from tests.lib import ( +@@ -27,9 +28,13 @@ def assert_editable(script: PipTestEnvironment, *args: str) -> None: + # This simply checks whether all of the listed packages have a + # corresponding .egg-link file installed. + # TODO: Implement a more rigorous way to test for editable installations. +- egg_links = {f"{arg}.egg-link" for arg in args} +- assert egg_links <= set( +- os.listdir(script.site_packages_path) ++ egg_links = {f"{canonicalize_name(arg)}.egg-link" for arg in args} ++ actual_egg_links = { ++ f"{canonicalize_name(p.stem)}.egg-link" ++ for p in script.site_packages_path.glob("*.egg-link") ++ } ++ assert ( ++ egg_links <= actual_egg_links + ), f"{args!r} not all found in {script.site_packages_path!r}" + + +@@ -1847,7 +1852,7 @@ def test_new_resolver_succeeds_on_matching_constraint_and_requirement( + + script.assert_installed(test_pkg="0.1.0") + if editable: +- assert_editable(script, "test-pkg") ++ assert_editable(script, "test_pkg") + + + def test_new_resolver_applies_url_constraint_to_dep(script: PipTestEnvironment) -> None: +diff --git a/tests/functional/test_show.py b/tests/functional/test_show.py +index b8ec0510a..05fccbbe3 100644 +--- a/tests/functional/test_show.py ++++ b/tests/functional/test_show.py +@@ -277,7 +277,10 @@ def test_show_required_by_packages_basic( + lines = result.stdout.splitlines() + + assert "Name: simple" in lines +- assert "Required-by: requires-simple" in lines ++ assert ( ++ "Required-by: requires_simple" in lines ++ or "Required-by: requires-simple" in lines ++ ) + + + def test_show_required_by_packages_capitalized( +@@ -294,7 +297,10 @@ def test_show_required_by_packages_capitalized( + lines = result.stdout.splitlines() + + assert "Name: simple" in lines +- assert "Required-by: Requires-Capitalized" in lines ++ assert ( ++ "Required-by: Requires_Capitalized" in lines ++ or "Required-by: Requires-Capitalized" in lines ++ ) + + + def test_show_required_by_packages_requiring_capitalized( +@@ -314,8 +320,13 @@ def test_show_required_by_packages_requiring_capitalized( + lines = result.stdout.splitlines() + print(lines) + +- assert "Name: Requires-Capitalized" in lines +- assert "Required-by: requires-requires-capitalized" in lines ++ assert ( ++ "Name: Requires_Capitalized" in lines or "Name: Requires-Capitalized" in lines ++ ) ++ assert ( ++ "Required-by: requires_requires_capitalized" in lines ++ or "Required-by: requires-requires-capitalized" in lines ++ ) + + + def test_show_skip_work_dir_pkg(script: PipTestEnvironment) -> None: +diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py +index d27c02e25..414926d12 100644 +--- a/tests/lib/__init__.py ++++ b/tests/lib/__init__.py +@@ -41,6 +41,7 @@ from pip._internal.models.search_scope import SearchScope + from pip._internal.models.selection_prefs import SelectionPreferences + from pip._internal.models.target_python import TargetPython + from pip._internal.network.session import PipSession ++from pip._internal.utils.egg_link import _egg_link_names + from tests.lib.venv import VirtualEnvironment + from tests.lib.wheel import make_wheel + +@@ -305,6 +306,12 @@ class TestPipResult: + def files_deleted(self) -> FoundFiles: + return FoundFiles(self._impl.files_deleted) + ++ def _get_egg_link_path_created(self, egg_link_paths: List[str]) -> Optional[str]: ++ for egg_link_path in egg_link_paths: ++ if egg_link_path in self.files_created: ++ return egg_link_path ++ return None ++ + def assert_installed( + self, + pkg_name: str, +@@ -320,7 +327,7 @@ class TestPipResult: + e = self.test_env + + if editable: +- pkg_dir = e.venv / "src" / pkg_name.lower() ++ pkg_dir = e.venv / "src" / canonicalize_name(pkg_name) + # If package was installed in a sub directory + if sub_dir: + pkg_dir = pkg_dir / sub_dir +@@ -329,22 +336,30 @@ class TestPipResult: + pkg_dir = e.site_packages / pkg_name + + if use_user_site: +- egg_link_path = e.user_site / f"{pkg_name}.egg-link" ++ egg_link_paths = [ ++ e.user_site / egg_link_name ++ for egg_link_name in _egg_link_names(pkg_name) ++ ] + else: +- egg_link_path = e.site_packages / f"{pkg_name}.egg-link" ++ egg_link_paths = [ ++ e.site_packages / egg_link_name ++ for egg_link_name in _egg_link_names(pkg_name) ++ ] + ++ egg_link_path_created = self._get_egg_link_path_created(egg_link_paths) + if without_egg_link: +- if egg_link_path in self.files_created: ++ if egg_link_path_created: + raise TestFailure( +- f"unexpected egg link file created: {egg_link_path!r}\n{self}" ++ f"unexpected egg link file created: {egg_link_path_created!r}\n" ++ f"{self}" + ) + else: +- if egg_link_path not in self.files_created: ++ if not egg_link_path_created: + raise TestFailure( +- f"expected egg link file missing: {egg_link_path!r}\n{self}" ++ f"expected egg link file missing: {egg_link_paths!r}\n{self}" + ) + +- egg_link_file = self.files_created[egg_link_path] ++ egg_link_file = self.files_created[egg_link_path_created] + egg_link_contents = egg_link_file.bytes.replace(os.linesep, "\n") + + # FIXME: I don't understand why there's a trailing . here +-- +2.43.0 + diff --git a/dev-python/pip/pip-23.3.2-r1.ebuild b/dev-python/pip/pip-23.3.2-r1.ebuild new file mode 100644 index 000000000000..be6f9d444a4f --- /dev/null +++ b/dev-python/pip/pip-23.3.2-r1.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# please bump dev-python/ensurepip-pip along with this package! + +DISTUTILS_USE_PEP517=setuptools +PYTHON_TESTED=( python3_{10..11} ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 ) +PYTHON_REQ_USE="ssl(+),threads(+)" + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="The PyPA recommended tool for installing Python packages" +HOMEPAGE=" + https://pip.pypa.io/en/stable/ + https://pypi.org/project/pip/ + https://github.com/pypa/pip/ +" +SRC_URI=" + https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz +" + +LICENSE="MIT" +# bundled deps +LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +SLOT="0" +IUSE="test-rust" + +RDEPEND=" + >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] +" +BDEPEND=" + ${RDEPEND} + test? ( + $(python_gen_cond_dep ' + dev-python/ensurepip-setuptools + dev-python/ensurepip-wheel + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/pretend[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/scripttest[${PYTHON_USEDEP}] + dev-python/tomli-w[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/werkzeug[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + test-rust? ( + dev-python/cryptography[${PYTHON_USEDEP}] + ) + ' "${PYTHON_TESTED[@]}") + ) +" + +distutils_enable_tests pytest + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}/pip-23.1-no-coverage.patch" + "${FILESDIR}/pip-23.3.1-no-color.patch" + "${FILESDIR}/${P}-setuptools-69.0.3.patch" + ) + + distutils-r1_python_prepare_all + + if use test; then + local wheels=( + "${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl + ) + mkdir tests/data/common_wheels/ || die + cp "${wheels[@]}" tests/data/common_wheels/ || die + fi +} + +python_compile_all() { + # 'pip completion' command embeds full $0 into completion script, which confuses + # 'complete' and causes QA warning when running as "${PYTHON} -m pip". + # This trick sets correct $0 while still calling just installed pip. + local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())' + "${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die + "${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die +} + +python_test() { + if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then + einfo "Skipping tests on ${EPYTHON}" + return 0 + fi + + local EPYTEST_DESELECT=( + tests/functional/test_inspect.py::test_inspect_basic + tests/functional/test_install.py::test_double_install_fail + # Internet + tests/functional/test_install.py::test_install_dry_run + tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject + tests/functional/test_install.py::test_install_8559_wheel_package_present + tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist + tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes + # TODO + tests/unit/test_network_auth.py::test_keyring_cli_get_password + tests/unit/test_network_auth.py::test_keyring_cli_set_password + # wants to install keyring from Internet, sigh + tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed + # probably a too strict assert + # https://github.com/pypa/pip/issues/12152 + tests/unit/test_req.py::TestRequirementSet::test_download_info_archive_cache_with_invalid_origin + ) + + if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then + EPYTEST_DESELECT+=( + tests/functional/test_install.py::test_install_sends_client_cert + tests/functional/test_install_config.py::test_do_not_prompt_for_authentication + tests/functional/test_install_config.py::test_prompt_for_authentication + tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed + ) + fi + + local -x SETUPTOOLS_USE_DISTUTILS=stdlib + local -x PIP_DISABLE_PIP_VERSION_CHECK=1 + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + local EPYTEST_XDIST=1 + epytest -m "not network" +} + +python_install_all() { + local DOCS=( AUTHORS.txt docs/html/**/*.rst ) + distutils-r1_python_install_all + + newbashcomp completion.bash pip + + insinto /usr/share/zsh/site-functions + newins completion.zsh _pip +} diff --git a/dev-python/pip/pip-23.3.2.ebuild b/dev-python/pip/pip-23.3.2.ebuild deleted file mode 100644 index 0b448915d1fb..000000000000 --- a/dev-python/pip/pip-23.3.2.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# please bump dev-python/ensurepip-pip along with this package! - -DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( python3_{10..11} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 ) -PYTHON_REQ_USE="ssl(+),threads(+)" - -inherit bash-completion-r1 distutils-r1 multiprocessing - -DESCRIPTION="The PyPA recommended tool for installing Python packages" -HOMEPAGE=" - https://pip.pypa.io/en/stable/ - https://pypi.org/project/pip/ - https://github.com/pypa/pip/ -" -SRC_URI=" - https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -# bundled deps -LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -SLOT="0" -IUSE="test-rust" - -RDEPEND=" - >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] -" -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel - dev-python/freezegun[${PYTHON_USEDEP}] - dev-python/pretend[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/scripttest[${PYTHON_USEDEP}] - dev-python/tomli-w[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - test-rust? ( - dev-python/cryptography[${PYTHON_USEDEP}] - ) - ' "${PYTHON_TESTED[@]}") - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/pip-23.1-no-coverage.patch" - "${FILESDIR}/pip-23.3.1-no-color.patch" - ) - - distutils-r1_python_prepare_all - - if use test; then - local wheels=( - "${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl - ) - mkdir tests/data/common_wheels/ || die - cp "${wheels[@]}" tests/data/common_wheels/ || die - fi -} - -python_compile_all() { - # 'pip completion' command embeds full $0 into completion script, which confuses - # 'complete' and causes QA warning when running as "${PYTHON} -m pip". - # This trick sets correct $0 while still calling just installed pip. - local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())' - "${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die - "${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die -} - -python_test() { - if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then - einfo "Skipping tests on ${EPYTHON}" - return 0 - fi - - local EPYTEST_DESELECT=( - tests/functional/test_inspect.py::test_inspect_basic - tests/functional/test_install.py::test_double_install_fail - # Internet - tests/functional/test_install.py::test_install_dry_run - tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject - tests/functional/test_install.py::test_install_8559_wheel_package_present - tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist - tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes - # TODO - tests/unit/test_network_auth.py::test_keyring_cli_get_password - tests/unit/test_network_auth.py::test_keyring_cli_set_password - # wants to install keyring from Internet, sigh - tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed - # probably a too strict assert - # https://github.com/pypa/pip/issues/12152 - tests/unit/test_req.py::TestRequirementSet::test_download_info_archive_cache_with_invalid_origin - ) - - if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then - EPYTEST_DESELECT+=( - tests/functional/test_install.py::test_install_sends_client_cert - tests/functional/test_install_config.py::test_do_not_prompt_for_authentication - tests/functional/test_install_config.py::test_prompt_for_authentication - tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed - ) - fi - - local -x SETUPTOOLS_USE_DISTUTILS=stdlib - local -x PIP_DISABLE_PIP_VERSION_CHECK=1 - epytest -m "not network" -n "$(makeopts_jobs)" -} - -python_install_all() { - local DOCS=( AUTHORS.txt docs/html/**/*.rst ) - distutils-r1_python_install_all - - newbashcomp completion.bash pip - - insinto /usr/share/zsh/site-functions - newins completion.zsh _pip -} diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest index 866c60a86d3d..cc9f1d2ba1be 100644 --- a/dev-python/python-caja/Manifest +++ b/dev-python/python-caja/Manifest @@ -1,3 +1,3 @@ DIST python-caja-1.26.0.tar.xz 314936 BLAKE2B 1fabd7bafa19051a19643aa9f10180d72062bc485231760439d988936406e07b9e600a80c1c9d45c88a5ac40c0b16e90878c02dba81f722d8a6f60713fe28cc7 SHA512 632b0b4a9fa29bdcde3b84b37820a7e171b59e78972f71c0c3d25d52cad8233ae7d1548e23ed6d3a06734b084532db1c4e85c3beaed15fce88cf8abff5be35d0 -EBUILD python-caja-1.26.0.ebuild 1231 BLAKE2B bc69b6bcc4d9d70c71871ea52427ab31d02336b81225c5f8fbc93a21ce59313e6a9474d47ecfed904d9f16e4c5532d14c0fc9fe7322d098f40f47296ee84c695 SHA512 f94323b2702eaaaab0348572616c1e9596f9ab310c2cfeb0a9aa8363d10058f01f6fd0c0fbb4122f593dde33a641a6e76168f1ecf7b5ee66dc0028c0cb890d13 +EBUILD python-caja-1.26.0.ebuild 1228 BLAKE2B af9b2dff2a31948f9d05c7e9aa35fde4225250c2d00fcbf3ecea414ac093bd8113156c633a459b8758345eee7214e070f1aa0ccc4a2b49d8f6bf8f879a495905 SHA512 0a40354460b1f1583e835be61dd0b18244de60b294d5149b1a966ef8ee7237f864c64810fb8a03b482e1024de7b2628c0dbad4cc9f12dc54974c8b3bd4286d8c MISC metadata.xml 257 BLAKE2B 3eb0f3cf82ee2bb7d34200462e04c5d523b6a4b7e61cfa78539c9a8dcaf8f2ff653b2566a741afb3a52df51c498baa02eab10632e2fab184dc829fcf702cd17e SHA512 aa9633e245e183be154cfa4577b9d7af1b79b1119b8f90638f2f1e2b6409e74d29d19f7269e45c26feb2b244a81d68759e8f1164aea15474b1812c1661ed4e58 diff --git a/dev-python/python-caja/python-caja-1.26.0.ebuild b/dev-python/python-caja/python-caja-1.26.0.ebuild index 284b2b2693de..666a0e058ac1 100644 --- a/dev-python/python-caja/python-caja-1.26.0.ebuild +++ b/dev-python/python-caja/python-caja-1.26.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 MATE_LA_PUNT="yes" -PYTHON_COMPAT=( python{3_9,3_10,3_11} ) +PYTHON_COMPAT=( python{3_10,3_11} ) inherit mate python-single-r1 @@ -29,7 +29,7 @@ RDEPEND="${COMMON_DEPEND}" BDEPEND="${COMMON_DEPEND} dev-util/gtk-doc - dev-util/gtk-doc-am + dev-build/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 ) -- cgit v1.2.3