commit: 4c788581b2c4fb5ac7a9dd2d08e8f0416ab7f489 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Nov 20 12:03:33 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Nov 20 12:05:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c788581
dev-python/meson-python: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/meson-python/Manifest | 2 - ...eson-python-0.16.0-pyproject-metadata-0.8.patch | 68 ---------------------- .../meson-python/meson-python-0.16.0-r1.ebuild | 53 ----------------- dev-python/meson-python/meson-python-0.17.0.ebuild | 61 ------------------- 4 files changed, 184 deletions(-) diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest index 627bff2caf89..23a6e6844b4e 100644 --- a/dev-python/meson-python/Manifest +++ b/dev-python/meson-python/Manifest @@ -1,3 +1 @@ -DIST meson-python-0.16.0.gh.tar.gz 74975 BLAKE2B af74d62a4567bc0a7524e815f1bb4ef3ae7290ccea38c00c3b0013f5e7777d6a41c1631b0c1d83fdd930836599752e3bba3c381c137d275103409a986df4e040 SHA512 99ea4304f15e2e13adf031e7c8cacbbc48c0c80f42a81f9d84242b6279ac9c1a13e3f162be5f472a1e498dc7cf3cba6799bf765b3fd441ac10cd87dc0db38678 -DIST meson-python-0.17.0.gh.tar.gz 79243 BLAKE2B f7eb63b1b6575b03d0a8e218b478a557260bd259206517155ba51f32aa3b168d6e999087ece5695c47addb8313227a24243b88d170ce4a1d0fbdef2cdcc492b2 SHA512 ae1466e6f7c6e1d57353be55d9f6dbba6cb532bf6581f8cf03bc2c13f2bd564f4c5ffee561cf1c46293e208da254dc56ec7311b148d2bf507ce5df875b4909de DIST meson-python-0.17.1.gh.tar.gz 79456 BLAKE2B 88bda9aadc74d186aab41c9b3a2fe5ba7d51b5997c1c043cf4ea9448395d0c5c5763ccf35358ab867d32a4537a4041a3cf480d82c9ec5cd8d1b5d6bc67d35fc8 SHA512 bd5f4c807468b81b3630eeb6973c2a574473c22298eb2c43d30b67b7503ce77fd79d4509a8f1b0186197622d281279a9c3aa5d9d1c2286d46b7aea1ff2461ae5 diff --git a/dev-python/meson-python/files/meson-python-0.16.0-pyproject-metadata-0.8.patch b/dev-python/meson-python/files/meson-python-0.16.0-pyproject-metadata-0.8.patch deleted file mode 100644 index 834aed4d2fb4..000000000000 --- a/dev-python/meson-python/files/meson-python-0.16.0-pyproject-metadata-0.8.patch +++ /dev/null @@ -1,68 +0,0 @@ -From ba14bfdffceb571a5e8c1406c76b7b77634bcb7f Mon Sep 17 00:00:00 2001 -From: Daniele Nicolodi <[email protected]> -Date: Mon, 15 Apr 2024 22:34:36 +0200 -Subject: [PATCH 2/2] TST: Adapt to changes in pyproject-metadata 0.8.0 - ---- - tests/test_metadata.py | 8 +++++++- - tests/test_sdist.py | 9 +++++++-- - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/tests/test_metadata.py b/tests/test_metadata.py -index 0c278da6..088e82f7 100644 ---- a/tests/test_metadata.py -+++ b/tests/test_metadata.py -@@ -3,6 +3,7 @@ - # SPDX-License-Identifier: MIT - - import pathlib -+import re - - import packaging.version - import pyproject_metadata -@@ -48,5 +49,10 @@ def test_missing_version(package_missing_version): - pyproject = {'project': { - 'name': 'missing-version', - }} -- with pytest.raises(pyproject_metadata.ConfigurationError, match='Required "project.version" field is missing'): -+ match = '|'.join(( -+ re.escape('Required "project.version" field is missing'), -+ # pyproject-metatadata 0.8.0 and later -+ re.escape('Field "project.version" missing and "version" not specified in "project.dynamic"'), -+ )) -+ with pytest.raises(pyproject_metadata.ConfigurationError, match=match): - Metadata.from_pyproject(pyproject, pathlib.Path()) -diff --git a/tests/test_sdist.py b/tests/test_sdist.py -index 6e337617..fb698b53 100644 ---- a/tests/test_sdist.py -+++ b/tests/test_sdist.py -@@ -3,6 +3,7 @@ - # SPDX-License-Identifier: MIT - - import os -+import re - import stat - import sys - import tarfile -@@ -30,7 +31,7 @@ def test_pep621(sdist_full_metadata): - with tarfile.open(sdist_full_metadata, 'r:gz') as sdist: - sdist_pkg_info = sdist.extractfile('full_metadata-1.2.3/PKG-INFO').read().decode() - -- assert sdist_pkg_info == textwrap.dedent('''\ -+ metadata = re.escape(textwrap.dedent('''\ - Metadata-Version: 2.1 - Name: full-metadata - Version: 1.2.3 -@@ -65,7 +66,11 @@ def test_pep621(sdist_full_metadata): - # full-metadata - - An example package with all of the PEP 621 metadata! -- ''') -+ ''')) -+ -+ # pyproject-metadata 0.8.0 and later uses a comma to separate keywords -+ expr = metadata.replace(r'Keywords:\ full\ metadata', r'Keywords:\ full[ ,]metadata') -+ assert re.fullmatch(expr, sdist_pkg_info) - - - def test_dynamic_version(sdist_dynamic_version): diff --git a/dev-python/meson-python/meson-python-0.16.0-r1.ebuild b/dev-python/meson-python/meson-python-0.16.0-r1.ebuild deleted file mode 100644 index 810deea27bec..000000000000 --- a/dev-python/meson-python/meson-python-0.16.0-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Meson PEP 517 Python build backend" -HOMEPAGE=" - https://pypi.org/project/meson-python/ - https://github.com/mesonbuild/meson-python/ -" -SRC_URI=" - https://github.com/mesonbuild/meson-python/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" - -RDEPEND=" - >=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}] - >=dev-build/meson-0.63.0 - !kernel_Darwin? ( dev-util/patchelf ) - $(python_gen_cond_dep ' - >=dev-python/tomli-1.0.0[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - >=dev-python/cython-0.29.34[${PYTHON_USEDEP}] - test? ( - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-vcs/git - ) -" - -distutils_enable_tests pytest - -PATCHES=( - # https://github.com/mesonbuild/meson-python/pull/612 - "${FILESDIR}/${P}-pyproject-metadata-0.8.patch" -) - -python_test() { - unset NINJA - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p pytest_mock -} diff --git a/dev-python/meson-python/meson-python-0.17.0.ebuild b/dev-python/meson-python/meson-python-0.17.0.ebuild deleted file mode 100644 index fd9f62165857..000000000000 --- a/dev-python/meson-python/meson-python-0.17.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Meson PEP 517 Python build backend" -HOMEPAGE=" - https://pypi.org/project/meson-python/ - https://github.com/mesonbuild/meson-python/ -" -SRC_URI=" - https://github.com/mesonbuild/meson-python/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" - -RDEPEND=" - >=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}] - >=dev-build/meson-0.63.0 - !kernel_Darwin? ( dev-util/patchelf ) - $(python_gen_cond_dep ' - >=dev-python/tomli-1.0.0[${PYTHON_USEDEP}] - ' 3.10) -" -# pyproject-metadata: https://github.com/mesonbuild/meson-python/issues/667 -BDEPEND=" - >=dev-python/cython-0.29.34[${PYTHON_USEDEP}] - test? ( - <dev-python/pyproject-metadata-0.9[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-vcs/git - ) -" - -distutils_enable_tests pytest - -src_test() { - # required by tests/test_sdist.py::test_reproducible - git config --global user.email "[email protected]" || die - git config --global user.name "The Test Suite" || die - git init -q || die - git add -A || die - git commit -m init -q || die - - distutils-r1_src_test -} - -python_test() { - unset NINJA - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p pytest_mock -}
