commit: 9c78741980a29df05cebd149162246ad01bd58be Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Jun 15 02:51:41 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Jun 15 02:51:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c787419
dev-python/pdm: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pdm/Manifest | 2 - .../pdm/files/pdm-2.24.0-respect-python.patch | 27 ------- dev-python/pdm/pdm-2.24.1.ebuild | 94 ---------------------- dev-python/pdm/pdm-2.24.2.ebuild | 81 ------------------- 4 files changed, 204 deletions(-) diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest index fb881cf06e17..ff8ff77caf41 100644 --- a/dev-python/pdm/Manifest +++ b/dev-python/pdm/Manifest @@ -1,3 +1 @@ -DIST pdm-2.24.1.tar.gz 2655876 BLAKE2B 557a1a8dac5fe2770a46f9f9baf17ee334795c88f17347924b5450dd681ac90da8c13f184020ee1d200d3d41bc91a6dadde98c210f3a7707c2ee8c83418b917c SHA512 5e41ffeeb8ebf431c840b156caa72e86c22313589f31430258c5002508cb9956f2bbf723c168697721bedb79af7d90bed54a00d53ad1a226f613324830a32146 -DIST pdm-2.24.2.tar.gz 2657737 BLAKE2B 8652b489d25f7b0bb3b60bf49ed136985b96aa2b7ac4fcbbe6e958e3dfe835dbc56684dd1a1a398bf103d91145dbccc377fb88e1d50ed045aebcf551917e092a SHA512 46c26f2384cefe73e361ee442b60dede14ecb14bd04844578f9b9fbda919f016026269d08776da70fb0f7bce41c061ba3b0874ef81c4d0eaf70a7e270c1cbcf2 DIST pdm-2.25.0.tar.gz 2662202 BLAKE2B d42f3344904f87f83d6e24fb7a46d27a2981da7c68acc099cb5759f14f03f0191622dfe4c5abe5408340868d889dcdec632597019b858c99e9dfdf952dd29673 SHA512 6b57f7d3ce69fa6b7de1e6b93f7defecd181b6f445a2075999faa9a45be87f79a54bbcb03e415ec2c6448eb3abde411c2a1de0ca163e45a5accbac105d21415c diff --git a/dev-python/pdm/files/pdm-2.24.0-respect-python.patch b/dev-python/pdm/files/pdm-2.24.0-respect-python.patch deleted file mode 100644 index 2707616263e7..000000000000 --- a/dev-python/pdm/files/pdm-2.24.0-respect-python.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6ac6bf373db1acee7f51a3d695e8b58e85f11801 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sat, 19 Apr 2025 11:13:02 +0200 -Subject: [PATCH] Force `sys.executable` in pytest fixture - -Fix the pytest fixture to respect `sys.executable` rather than finding -an arbitrary Python version in `sys.base_prefix`. No clue why upstream -changed the logic to do the latter, but it is clearly wrong on Gentoo. - -Bug: https://github.com/pdm-project/pdm/issues/3486 ---- - src/pdm/pytest.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pdm/pytest.py b/src/pdm/pytest.py -index d23ad4b9..3f50c0f2 100644 ---- a/src/pdm/pytest.py -+++ b/src/pdm/pytest.py -@@ -407,7 +407,7 @@ def project_no_init( - tmp_path.joinpath("caches").mkdir(parents=True) - p.global_config["cache_dir"] = tmp_path.joinpath("caches").as_posix() - p.global_config["log_dir"] = tmp_path.joinpath("logs").as_posix() -- python_path = find_python_in_path(sys.base_prefix) -+ python_path = Path(sys.executable) - if python_path is None: - raise ValueError("Unable to find a Python path") - p._saved_python = python_path.as_posix() diff --git a/dev-python/pdm/pdm-2.24.1.ebuild b/dev-python/pdm/pdm-2.24.1.ebuild deleted file mode 100644 index 467c05edd319..000000000000 --- a/dev-python/pdm/pdm-2.24.1.ebuild +++ /dev/null @@ -1,94 +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.5[${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/id-1.5.0[${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.5[${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/pytest-httpx[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - dev-python/uv - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - # https://github.com/pdm-project/pdm/issues/3486 - "${FILESDIR}/${PN}-2.24.0-respect-python.patch" - ) - - distutils-r1_src_prepare - - # unpin deps - sed -i -e 's:,<[0-9.a]*::' pyproject.toml || die -} - -python_test() { - local EPYTEST_DESELECT=( - # Internet - # https://github.com/pdm-project/pdm/pull/3488 - # (the third one I can't reproduce) - tests/models/test_candidates.py::test_find_candidates_from_find_links - 'tests/test_project.py::test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV[True]' - 'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]' - - # unhappy about extra packages being installed? - # (also fails randomly in venv) - tests/cli/test_build.py::test_build_with_no_isolation - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -m "not network and not integration and not path" \ - -p pytest_mock -p pytest_httpx -p pytest_httpserver -} diff --git a/dev-python/pdm/pdm-2.24.2.ebuild b/dev-python/pdm/pdm-2.24.2.ebuild deleted file mode 100644 index 140608328df2..000000000000 --- a/dev-python/pdm/pdm-2.24.2.ebuild +++ /dev/null @@ -1,81 +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_{11..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.5[${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/id-1.5.0[${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.5[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] -" -BDEPEND=" - ${RDEPEND} - 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 - ) -" - -EPYTEST_XDIST=1 -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/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]' - # unhappy about extra packages being installed? - # (also fails randomly in venv) - tests/cli/test_build.py::test_build_with_no_isolation - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -m "not network and not integration and not path" \ - -p pytest_mock -p pytest_httpx -p pytest_httpserver -}
