public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/, dev-python/meson-python/files/
Date: Tue,  5 Jul 2022 02:30:19 +0000 (UTC)	[thread overview]
Message-ID: <1656988023.dd267aff1c6278d5895031a664388a9935874647.sam@gentoo> (raw)

commit:     dd267aff1c6278d5895031a664388a9935874647
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 02:26:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 02:27:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd267aff

dev-python/meson-python: drop 0.5.0-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/meson-python/Manifest                   |   1 -
 .../meson-python-0.5.0-pyproject-metadata.patch    | 110 ---------------------
 .../meson-python/meson-python-0.5.0-r1.ebuild      |  46 ---------
 3 files changed, 157 deletions(-)

diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 25059d789196..bfaef08c5220 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,2 +1 @@
-DIST meson-python-0.5.0.gh.tar.gz 30525 BLAKE2B f9afcb0edfdb06ce001b5185bf8c09de18a35d0f2d12f8fd69ed35cf17cc5e987c73724403fe1d6c44c80f1fad41b4b66b07b26e050b551673b3860a3d453a29 SHA512 e3941d258c5d16d0355752aff2f6458705a6af7d83850f679c5304d61699c393e186b9da2fe1a6405cb616a319250351e02ad81ddc8abf042f64c6b42b0be1cf
 DIST meson-python-0.6.0.gh.tar.gz 26783 BLAKE2B d5c5b95d5d609487a0efee1ce05b133794705cdb16f2d05d6e08b9201541e31f61a832c7770b4b5ad675f8dd91860c30c67769ce8fc0af2c48e65b0aad187ddb SHA512 25042ea030d2ad323c67daa0a520db936a4a4efa0de1c9f631c47fac22d797e01d1f1707ed407e2931164a35b3916e19a774ee16ab1d45fc91e41c75add57fa1

diff --git a/dev-python/meson-python/files/meson-python-0.5.0-pyproject-metadata.patch b/dev-python/meson-python/files/meson-python-0.5.0-pyproject-metadata.patch
deleted file mode 100644
index fd96d942eb73..000000000000
--- a/dev-python/meson-python/files/meson-python-0.5.0-pyproject-metadata.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-https://github.com/FFY00/meson-python/commit/678a586427088a58dfac15bb3fe89b3d7ff0178e
-https://github.com/FFY00/meson-python/commit/c01645aa3617ccd424ef3ec052d13ac25e7df433
-
-From 678a586427088a58dfac15bb3fe89b3d7ff0178e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@riseup.net>
-Date: Thu, 9 Jun 2022 20:24:32 +0100
-Subject: [PATCH] mesonpy: replace pep621 dependency with pyproject-metadata
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes #33
-
-Signed-off-by: Filipe Laíns <lains@riseup.net>
---- a/mesonpy/__init__.py
-+++ b/mesonpy/__init__.py
-@@ -46,7 +46,7 @@
- 
- 
- if typing.TYPE_CHECKING:  # pragma: no cover
--    import pep621 as _pep621  # noqa: F401
-+    import pyproject_metadata  # noqa: F401
-     import wheel.wheelfile  # noqa: F401
- 
- 
-@@ -353,7 +353,7 @@ class Project():
-     _ALLOWED_DYNAMIC_FIELDS: ClassVar[List[str]] = [
-         'version',
-     ]
--    _metadata: Optional[_pep621.StandardMetadata]
-+    _metadata: Optional[pyproject_metadata.StandardMetadata]
- 
-     def __init__(
-         self,
-@@ -372,11 +372,11 @@ def __init__(
-         self._pep621 = 'project' in self._config
-         if self.pep621:
-             try:
--                import pep621  # noqa: F811
-+                import pyproject_metadata  # noqa: F811
-             except ModuleNotFoundError:  # pragma: no cover
-                 self._metadata = None
-             else:
--                self._metadata = pep621.StandardMetadata.from_pyproject(self._config, self._source_dir)
-+                self._metadata = pyproject_metadata.StandardMetadata.from_pyproject(self._config, self._source_dir)
-         else:
-             print(
-                 '{yellow}{bold}! Using Meson to generate the project metadata '
-@@ -550,8 +550,8 @@ def metadata(self) -> bytes:  # noqa: C901
-                 Name: {self.name}
-                 Version: {self.version}
-             ''').strip().encode()
--        # re-import pep621 to raise ModuleNotFoundError if it is really missing
--        import pep621  # noqa: F401, F811
-+        # re-import pyproject_metadata to raise ModuleNotFoundError if it is really missing
-+        import pyproject_metadata  # noqa: F401, F811
-         assert self._metadata
-         # use self.version as the version may be dynamic -- fetched from Meson
-         core_metadata = self._metadata.as_rfc822()
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -4,7 +4,7 @@ backend-path = ['.']
- requires = [
-   'meson>=0.62.0',
-   'ninja',
--  'pep621>=0.3.0',
-+  'pyproject-metadata>=0.5.0',
-   'tomli>=1.0.0',
-   'typing-extensions>=3.7.4; python_version<"3.8"',
- ]
-@@ -29,7 +29,7 @@ dependencies = [
-   'colorama; os_name == "nt"',
-   'meson>=0.60.0',
-   'ninja',
--  'pep621>=0.3.0', # not a hard dependency, only needed for projects that use PEP 621 metadata
-+  'pyproject-metadata>=0.5.0', # not a hard dependency, only needed for projects that use PEP 621 metadata
-   'tomli>=1.0.0',
-   'typing-extensions>=3.7.4; python_version<"3.8"',
- ]
-@@ -41,7 +41,6 @@ test = [
-   'pytest-mock',
-   'GitPython',
-   'auditwheel',
--  'pep621 >= 0.4.0',
- ]
- docs = [
-   'furo>=2021.08.31',
-
-From c01645aa3617ccd424ef3ec052d13ac25e7df433 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@riseup.net>
-Date: Thu, 9 Jun 2022 20:27:49 +0100
-Subject: [PATCH] mesonpy: update code to pyproject-metadata 0.5.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Filipe Laíns <lains@riseup.net>
---- a/mesonpy/__init__.py
-+++ b/mesonpy/__init__.py
-@@ -424,9 +424,6 @@ def __init__(
-         # set version if dynamic (this fetches it from Meson)
-         if self._metadata and 'version' in self._metadata.dynamic:
-             self._metadata.version = self.version
--            # version is no longer dynamic
--            # XXX: Should this be automatically handled by pep621/pyproject-metadata?
--            self._metadata.dynamic.remove('version')
- 
-     def _proc(self, *args: str) -> None:
-         print('{cyan}{bold}+ {}{reset}'.format(' '.join(args), **_STYLES))
-

diff --git a/dev-python/meson-python/meson-python-0.5.0-r1.ebuild b/dev-python/meson-python/meson-python-0.5.0-r1.ebuild
deleted file mode 100644
index 708c817c7349..000000000000
--- a/dev-python/meson-python/meson-python-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Meson PEP 517 Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/meson-python/
-	https://github.com/FFY00/meson-python/
-"
-SRC_URI="
-	https://github.com/FFY00/meson-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="EUPL-1.2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pyproject-metadata-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-	>=dev-util/meson-0.60.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/GitPython[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-util/patchelf
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pyproject-metadata.patch
-	"${FILESDIR}"/${PN}-0.5.0-defaults.patch
-)
-
-distutils_enable_sphinx docs \
-	dev-python/furo \
-	dev-python/sphinx-autodoc-typehints
-distutils_enable_tests pytest


             reply	other threads:[~2022-07-05  2:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-05  2:30 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-17 13:52 [gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/, dev-python/meson-python/files/ Michał Górny
2023-10-06 19:05 Michał Górny
2023-07-17  1:18 Benda XU
2023-05-27 15:53 Michał Górny
2022-06-12  8:47 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1656988023.dd267aff1c6278d5895031a664388a9935874647.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox