gentoo auto-resync : 10:04:2025 - 08:43:23

3 files changed, 7 insertions, 138 deletions

diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest
index a1e0909b54f1..15f8df06e211 100644
--- a/dev-python/pdm/Manifest
+++ b/dev-python/pdm/Manifest
@@ -1,7 +1,5 @@
-DIST pdm-2.22.3.tar.gz 2647179 BLAKE2B 61a2e99fabe3395d1f472cf6835a4b56fcecd02a3acf964051bde1304028db575cfcb77803922b2bf0f9f9be3864e59ae2f2f075d41e38a82fd07bdd5f9a8d22 SHA512 2d0aa9aa075e26d5184853d41e95d0427ac4c9a15ddfc00a2881a4edcd0d373d8c71efde2fd0f1f30861e07b418c577b123f53125883f6f5d424609f1c758b80
-DIST pdm-2.22.4.tar.gz 2647094 BLAKE2B 629b855964be63f4cddf9dd295390e62c5b948e1a450357ca9dce4f940e99064c335d670bd695c3fc62606452e7252f5ec4fcc145ec73b14ea6181e1c4193454 SHA512 9988420d27f1a409f81b33be8eeb7a209a37529e838465bde815f6bb50c923cb44004e528f735d99ddff02c11bc88dbf1544f310836262b158f783db241e5c9f
 DIST pdm-2.23.0.tar.gz 2648692 BLAKE2B aba0a73dbf6a34636144bf35e04226d8b11cc4e54f22c8c15f486424d564aa59161662477d0f740ed489382dfd7d95b743f4a548059c67dccb1caef4588d6db7 SHA512 47b17fcd23ead47886359f34eeb73783688349339efa00af709f740eefe9722d3313baea9ba479892dad9bc67ff85ec8b94d790f15cc9ab5a8322a09711ed0ff
-EBUILD pdm-2.22.3.ebuild 5583 BLAKE2B 908c909a910fb4b697f817592d9f153f0eb1aa1a431baa95d459806e13c0abaced3f6c5225ae9d4c67cd2d66e9af4a35094951e4e2ac81640bc0eee71d54cf9c SHA512 9f4b81dca1f7131c0d92c043af5c5b99d70ebe5036e9514d5c1053f67256d0d80c3a133f52b33e71908646773e2f8fea0571bedaa3af1b0ebed8753fa7ba9770
-EBUILD pdm-2.22.4.ebuild 5583 BLAKE2B 908c909a910fb4b697f817592d9f153f0eb1aa1a431baa95d459806e13c0abaced3f6c5225ae9d4c67cd2d66e9af4a35094951e4e2ac81640bc0eee71d54cf9c SHA512 9f4b81dca1f7131c0d92c043af5c5b99d70ebe5036e9514d5c1053f67256d0d80c3a133f52b33e71908646773e2f8fea0571bedaa3af1b0ebed8753fa7ba9770
+DIST pdm-2.23.1.tar.gz 2650012 BLAKE2B 02e5189aa83425aca6f23091bb4596498302375915772aa770b69563fe4d4218d92059daceae3df7e528136b1d4f733e116efcba98e1477e5ad848fb8ecb0b1a SHA512 857367c90e6d92c2d7cb5143c9a9bcf4ea5402a2ef1334efca259ec079f97e4b87da1c1a86cd736e8ec4d8c69c80da9c3ca1c5413c72d431be96ba85c914662c
 EBUILD pdm-2.23.0.ebuild 5583 BLAKE2B 908c909a910fb4b697f817592d9f153f0eb1aa1a431baa95d459806e13c0abaced3f6c5225ae9d4c67cd2d66e9af4a35094951e4e2ac81640bc0eee71d54cf9c SHA512 9f4b81dca1f7131c0d92c043af5c5b99d70ebe5036e9514d5c1053f67256d0d80c3a133f52b33e71908646773e2f8fea0571bedaa3af1b0ebed8753fa7ba9770
+EBUILD pdm-2.23.1.ebuild 5736 BLAKE2B 29639b29bbd837cb63c349c017e5646dcd05469de7ac228688c060f5fbba698bb16c96413a9fef45008ee739d6e1c6d24e1e6a6e30afa8bf62b668048db60de0 SHA512 e0d0a828e92e2d0ae0fbd64252537754627b6d9ff8a94126f02b90100a96e1b3caedc944e7434b63b467450a827680378c2331bf4f11f8c0d599dabba6c35e15
 MISC metadata.xml 474 BLAKE2B c1471e124a955920e30f73dfa43a87999c30c2bb9615590f601befcc07f7d939ec68908e67c7345fca4cb0f0524d33507aeac9936fa30d449d1dde17094048d3 SHA512 a07256061dda5a8cf8b0e15205ac36651a4e5b594fdedbfe16d1d3264e1ac42847d1dc222d2857232ac5206d67feda432751695d85d0c4c7b03fd7228db8b1ab
diff --git a/dev-python/pdm/pdm-2.22.4.ebuild b/dev-python/pdm/pdm-2.22.4.ebuild
deleted file mode 100644
index d8a8156f0d6f..000000000000
--- a/dev-python/pdm/pdm-2.22.4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
-HOMEPAGE="
-	https://pdm-project.org/
-	https://github.com/pdm-project/pdm/
-	https://pypi.org/project/pdm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/dep-logic-0.4.4[${PYTHON_USEDEP}]
-	<dev-python/findpython-1[${PYTHON_USEDEP}]
-	>=dev-python/findpython-0.6.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/hishel-0.0.32[${PYTHON_USEDEP}]
-	>=dev-python/httpcore-1.0.6[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/installer[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pbs-installer-2024.4.18[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.1[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9[${PYTHON_USEDEP}]
-	>=dev-python/unearth-0.17.0[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/uv
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unpin deps
-	sed -i -e 's:,<[0-9.a]*::' pyproject.toml || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		'tests/cli/test_build.py::test_build_with_no_isolation[False]'
-		tests/test_project.py::test_access_index_with_auth
-		"tests/test_project.py::test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV[True]"
-		tests/cli/test_others.py::test_build_distributions
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[-e file:///${PROJECT_ROOT}/tests/fixtures/projects/demo-#-with-hash#egg=demo]'
-		tests/models/test_candidates.py::test_find_candidates_from_find_links
-		tests/cli/test_build.py::test_build_single_module
-		tests/cli/test_build.py::test_build_single_module_with_readme
-		tests/cli/test_build.py::test_build_package
-		tests/cli/test_build.py::test_build_src_package
-		tests/cli/test_build.py::test_build_package_include
-		tests/cli/test_build.py::test_build_src_package_by_include
-		tests/cli/test_build.py::test_build_with_config_settings
-		tests/cli/test_build.py::test_cli_build_with_config_settings
-		tests/cli/test_build.py::test_build_ignoring_pip_environment
-		tests/cli/test_others.py::test_show_self_package
-		tests/cli/test_publish.py::test_publish_and_build_in_one_run
-		"tests/cli/test_hooks.py::test_hooks[build]"
-		"tests/cli/test_hooks.py::test_hooks[publish]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-pre_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-post_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_publish]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_publish]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-build]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-publish]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-build]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-publish]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-build]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-publish]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-build]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-publish]"
-		"tests/cli/test_venv.py::test_conda_backend_create[True]"
-		"tests/cli/test_venv.py::test_conda_backend_create[False]"
-		tests/cli/test_lock.py::test_lock_all_with_excluded_groups
-		'tests/resolver/test_resolve.py::test_resolve_local_artifacts[sdist]'
-		'tests/resolver/test_resolve.py::test_resolve_two_extras_from_the_same_package'
-		'tests/resolver/test_resolve.py::test_resolve_file_req_with_prerelease'
-		# hangs on interactive keyring prompts
-		tests/cli/test_config.py::test_repository_overwrite_default
-		tests/cli/test_config.py::test_hide_password_in_output_repository
-		tests/cli/test_config.py::test_hide_password_in_output_pypi
-		# junk output, sigh
-		tests/cli/test_others.py::test_info_command_json
-		# why does it try to use python 2.7?!
-		tests/cli/test_run.py::test_import_another_sitecustomize
-		# fails in tinderbox (bug #928964)
-		tests/test_project.py::test_project_packages_path
-		# i guess doesn't expect some dep to be present
-		tests/cli/test_build.py::test_build_with_no_isolation
-	)
-	[[ ${EPYTHON} != python3.10 ]] && EPYTEST_DESELECT+=(
-		# test seems hardcoded to 3.10
-		tests/test_project.py::test_project_packages_path
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest  -m "not network and not integration and not path" \
-		-p pytest_mock
-}
diff --git a/dev-python/pdm/pdm-2.22.3.ebuild b/dev-python/pdm/pdm-2.23.1.ebuild
index d8a8156f0d6f..4ae1eec66e42 100644
--- a/dev-python/pdm/pdm-2.22.3.ebuild
+++ b/dev-python/pdm/pdm-2.23.1.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 	>=dev-python/hishel-0.0.32[${PYTHON_USEDEP}]
 	>=dev-python/httpcore-1.0.6[${PYTHON_USEDEP}]
 	dev-python/httpx[${PYTHON_USEDEP}]
+	>=dev-python/id-1.5.0[${PYTHON_USEDEP}]
 	dev-python/installer[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
@@ -41,7 +42,7 @@ RDEPEND="
 	dev-python/shellingham[${PYTHON_USEDEP}]
 	dev-python/tomlkit[${PYTHON_USEDEP}]
 	>=dev-python/truststore-0.9[${PYTHON_USEDEP}]
-	>=dev-python/unearth-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/unearth-0.17.5[${PYTHON_USEDEP}]
 	dev-python/virtualenv[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
@@ -52,6 +53,8 @@ BDEPEND="
 	test? (
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		dev-python/pytest-httpx[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		dev-python/uv
 	)
 "
@@ -128,5 +131,5 @@ python_test() {
 
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest  -m "not network and not integration and not path" \
-		-p pytest_mock
+		-p pytest_mock -p pytest_httpx
 }