* [gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/, dev-python/meson-python/files/
@ 2022-06-12 8:47 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-06-12 8:47 UTC (permalink / raw
To: gentoo-commits
commit: e5d628898d31a72c705c6cf0f069d2cf0da987fb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 5 20:38:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 08:47:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d62889
dev-python/meson-python: add gentoo defaults; fix pyproject-python support
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/meson-python-0.5.0-defaults.patch | 23 +++++
.../meson-python-0.5.0-pyproject-metadata.patch | 110 +++++++++++++++++++++
.../meson-python/meson-python-0.5.0-r1.ebuild | 46 +++++++++
3 files changed, 179 insertions(+)
diff --git a/dev-python/meson-python/files/meson-python-0.5.0-defaults.patch b/dev-python/meson-python/files/meson-python-0.5.0-defaults.patch
new file mode 100644
index 000000000000..07077ba4fdc2
--- /dev/null
+++ b/dev-python/meson-python/files/meson-python-0.5.0-defaults.patch
@@ -0,0 +1,23 @@
+See https://github.com/FFY00/meson-python/blob/main/mesonpy/__init__.py#L452.
+
+(Also: https://github.com/FFY00/meson-python/issues/54)
+--- a/mesonpy/__init__.py
++++ b/mesonpy/__init__.py
+@@ -452,7 +452,7 @@ class Project():
+ f'--native-file={os.fspath(self._meson_native_file)}',
+ # TODO: Allow configuring these arguments
+ '-Ddebug=false',
+- '-Dstrip=true',
++ '-Dstrip=false',
+ '-Doptimization=2',
+ *setup_args,
+ )
+@@ -464,7 +464,7 @@ class Project():
+
+ @functools.lru_cache(maxsize=None)
+ def build(self) -> None:
+- self._meson('compile')
++ self._meson('compile', '--verbose')
+ self._meson('install', '--destdir', os.fspath(self._install_dir))
+
+ @classmethod
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
new file mode 100644
index 000000000000..fd96d942eb73
--- /dev/null
+++ b/dev-python/meson-python/files/meson-python-0.5.0-pyproject-metadata.patch
@@ -0,0 +1,110 @@
+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
new file mode 100644
index 000000000000..708c817c7349
--- /dev/null
+++ b/dev-python/meson-python/meson-python-0.5.0-r1.ebuild
@@ -0,0 +1,46 @@
+# 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/, dev-python/meson-python/files/
@ 2022-07-05 2:30 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-07-05 2:30 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/, dev-python/meson-python/files/
@ 2023-05-27 15:53 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2023-05-27 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 6bdb9d0d2536883edcf829691b1aaa81d71c2274
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 15:45:20 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 27 15:53:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bdb9d0d
dev-python/meson-python: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/meson-python/Manifest | 2 -
.../files/meson-python-0.11.0-defaults.patch | 14 -----
dev-python/meson-python/meson-python-0.12.1.ebuild | 68 ----------------------
dev-python/meson-python/meson-python-0.13.0.ebuild | 59 -------------------
4 files changed, 143 deletions(-)
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 071e40299d3d..bce82da4a05e 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,3 +1 @@
-DIST meson-python-0.12.1.gh.tar.gz 43855 BLAKE2B 96b9ff5ef628bb471f7f79ce30ec6f3f851ce0006327e8b3a6003fdcb768f3280c0ee882d1c0c8ea183b0f2319d7c977c3fbb62742e3127bafb73e9732b3a1a9 SHA512 6f8e840da0155f2dd0e7139387f875cfad79eb042abcfa69b3043f51cbae3222fc2986e13798389909a0b4719513c93af381ec00a69fdfedf14bbe4e100b2f08
-DIST meson-python-0.13.0.gh.tar.gz 69373 BLAKE2B 439ec0fcffa5398ec400c492bc7719030981605c885158fd477e293b62c6e0eeaf3eba0327937817c20b7d23141749ff4bc71d12a67dbf3473168555cef97918 SHA512 2d319090f77daf5c1bd2a922e50e960fb416008ec60f3e8956ba4d2a29c31129e0a0d864982e9e1c0d6b7659d107e5d90d4a540d84f56cb2a8f79f013d4f14ae
DIST meson-python-0.13.1.gh.tar.gz 69434 BLAKE2B c3442eb1c066772b80efe4e41764897df85a3581c94f9d958951af04e9ad7a01c646c7ed7f0104fbe957567e16b80c6e3744ab23b6b66a8df3cc920cb68c852f SHA512 037825eabcaec5bdb73890114ecfcfb05373bcb5e2806a8d38e4afeeecea42aa14f9c8cf0bec151bd231e2984c64608b28a1ec79640485933cd57c8895b6a305
diff --git a/dev-python/meson-python/files/meson-python-0.11.0-defaults.patch b/dev-python/meson-python/files/meson-python-0.11.0-defaults.patch
deleted file mode 100644
index 6bd63f6d132e..000000000000
--- a/dev-python/meson-python/files/meson-python-0.11.0-defaults.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-See https://github.com/mesonbuild/meson-python/blob/main/mesonpy/__init__.py#L452.
-
-(Also: https://github.com/mesonbuild/meson-python/issues/54)
---- a/mesonpy/__init__.py
-+++ b/mesonpy/__init__.py
-@@ -734,7 +734,7 @@ class Project():
- @functools.lru_cache(maxsize=None)
- def build(self) -> None:
- """Trigger the Meson build."""
-- self._meson('compile', *self._meson_args['compile'],)
-+ self._meson('compile', '--verbose', *self._meson_args['compile'],)
- self._meson('install', '--destdir', os.fspath(self._install_dir), *self._meson_args['install'],)
-
- @classmethod
diff --git a/dev-python/meson-python/meson-python-0.12.1.ebuild b/dev-python/meson-python/meson-python-0.12.1.ebuild
deleted file mode 100644
index f3c6601c6b6f..000000000000
--- a/dev-python/meson-python/meson-python-0.12.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9..11} )
-
-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="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
- >=dev-python/pyproject-metadata-0.6.1[${PYTHON_USEDEP}]
- >=dev-util/meson-0.63.0[${PYTHON_USEDEP}]
- dev-util/patchelf
- $(python_gen_cond_dep '
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ' 3.8 3.9)
- $(python_gen_cond_dep '
- >=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
- ' 3.8 3.9 3.10)
-"
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- test? (
- dev-python/GitPython[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.11.0-defaults.patch
-)
-
-distutils_enable_sphinx docs \
- dev-python/furo \
- dev-python/sphinx-autodoc-typehints
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # requires network access
- tests/test_pep518.py::test_pep518
-)
-
-python_test() {
- local EPYTEST_DESELECT=(
- # requires network access
- tests/test_pep518.py::test_pep518
- )
- unset NINJA
-
- epytest
-
- rm -rf docs/examples/spam/build/ || die # remove artifacts
-}
diff --git a/dev-python/meson-python/meson-python-0.13.0.ebuild b/dev-python/meson-python/meson-python-0.13.0.ebuild
deleted file mode 100644
index 4ac32a433449..000000000000
--- a/dev-python/meson-python/meson-python-0.13.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9..11} )
-
-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="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
- >=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
- >=dev-util/meson-0.63.0[${PYTHON_USEDEP}]
- dev-util/patchelf
- $(python_gen_cond_dep '
- >=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
- ' 3.9 3.10)
-"
-BDEPEND="
- >=dev-python/cython-0.29.34[${PYTHON_USEDEP}]
- test? (
- dev-python/GitPython[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
- ' 3.9)
- )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # requires network access
- tests/test_pep518.py::test_pep518
- # requires git repo
- # https://github.com/mesonbuild/meson-python/issues/397
- tests/test_project.py::test_user_args
- )
- unset NINJA
-
- epytest
-
- rm -rf docs/examples/spam/build/ || die # remove artifacts
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/, dev-python/meson-python/files/
@ 2023-07-17 1:18 Benda XU
0 siblings, 0 replies; 6+ messages in thread
From: Benda XU @ 2023-07-17 1:18 UTC (permalink / raw
To: gentoo-commits
commit: f4e9370d76817e46724cfbd5f1aaa9212e11dc25
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 00:05:11 2023 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 01:17:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e9370d
dev-python/meson-python: recognize python modules on Prefix/macOS
keyword 0.13.2 for ~arm64-macos, ~x64-macos.
At Prefix/macOS we conventionally name the python modules as .bundle.
Bug: https://bugs.gentoo.org/910401
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
.../files/meson-python-0.13.2_Mach-O_bundle.patch | 21 +++++++++++++++++++++
dev-python/meson-python/meson-python-0.13.2.ebuild | 4 +++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/dev-python/meson-python/files/meson-python-0.13.2_Mach-O_bundle.patch b/dev-python/meson-python/files/meson-python-0.13.2_Mach-O_bundle.patch
new file mode 100644
index 000000000000..2531c93f41e2
--- /dev/null
+++ b/dev-python/meson-python/files/meson-python-0.13.2_Mach-O_bundle.patch
@@ -0,0 +1,21 @@
+Support .bundle python modules at Prefix/macOS.
+
+Not forwarding to upstream because we are reflecting on the naming
+scheme of plugin modules on Prefix/macOS.
+
+Bug: https://bugs.gentoo.org/910401
+Signed-off-by: Benda Xu <heroxbd@gentoo.org>
+
+Index: meson-python-0.13.2/mesonpy/__init__.py
+===================================================================
+--- meson-python-0.13.2.orig/mesonpy/__init__.py
++++ meson-python-0.13.2/mesonpy/__init__.py
+@@ -129,7 +129,7 @@ _STYLES = _init_colors() # holds the co
+
+ _SUFFIXES = importlib.machinery.all_suffixes()
+ _EXTENSION_SUFFIXES = importlib.machinery.EXTENSION_SUFFIXES
+-_EXTENSION_SUFFIX_REGEX = re.compile(r'^\.(?:(?P<abi>[^.]+)\.)?(?:so|pyd|dll)$')
++_EXTENSION_SUFFIX_REGEX = re.compile(r'^\.(?:(?P<abi>[^.]+)\.)?(?:so|pyd|dll|bundle)$')
+ assert all(re.match(_EXTENSION_SUFFIX_REGEX, x) for x in _EXTENSION_SUFFIXES)
+
+
diff --git a/dev-python/meson-python/meson-python-0.13.2.ebuild b/dev-python/meson-python/meson-python-0.13.2.ebuild
index a3ead795daa5..37341a7784da 100644
--- a/dev-python/meson-python/meson-python-0.13.2.ebuild
+++ b/dev-python/meson-python/meson-python-0.13.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
RDEPEND="
>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
@@ -40,6 +40,8 @@ BDEPEND="
)
"
+PATCHES=( "${FILESDIR}"/meson-python-0.13.2_Mach-O_bundle.patch )
+
distutils_enable_tests pytest
python_test() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/, dev-python/meson-python/files/
@ 2023-10-06 19:05 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2023-10-06 19:05 UTC (permalink / raw
To: gentoo-commits
commit: bb352342ccaffe47d02eb7f27ad41780ab3512a9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 6 18:59:20 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 6 19:03:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb352342
dev-python/meson-python: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/meson-python/Manifest | 1 -
.../files/meson-python-0.13.2_Mach-O_bundle.patch | 21 -------
.../meson-python/meson-python-0.13.2-r1.ebuild | 68 ----------------------
3 files changed, 90 deletions(-)
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index d8a34123b38f..33f179cd56d0 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,2 +1 @@
-DIST meson-python-0.13.2.gh.tar.gz 69575 BLAKE2B ddcab5530e7c235057752f1c355052120863167fc601b669e3add713079400cf95617be84989e06542125850559124d70a693a618cbec456c0e59e3f80d14c5f SHA512 b5518c5e9ccbec40747f2c08a83134f012557e0d9612b99999473d2ae7fdfdeae5b7552dc16cebb493133c3ed8c52153b3e3afd3cef32d0f3a65771ebbb5b3bb
DIST meson-python-0.14.0.gh.tar.gz 72523 BLAKE2B d0fd66dee8a5efd73e617033aec3f14eb66affe72cd84c30a740820f5a0c34a4ae4ffd31e1df26312513b312940f62af436b9870216ee93d7543b4f02dec6637 SHA512 f40963a9c2bca8edf0f5651f9f4f1fab8df89cca715dd8dc0dec11ac53a591ee19d2d06edead917f15382410a51a37cd4efcee2c52696eb10a546b080bac2ad8
diff --git a/dev-python/meson-python/files/meson-python-0.13.2_Mach-O_bundle.patch b/dev-python/meson-python/files/meson-python-0.13.2_Mach-O_bundle.patch
deleted file mode 100644
index 2531c93f41e2..000000000000
--- a/dev-python/meson-python/files/meson-python-0.13.2_Mach-O_bundle.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Support .bundle python modules at Prefix/macOS.
-
-Not forwarding to upstream because we are reflecting on the naming
-scheme of plugin modules on Prefix/macOS.
-
-Bug: https://bugs.gentoo.org/910401
-Signed-off-by: Benda Xu <heroxbd@gentoo.org>
-
-Index: meson-python-0.13.2/mesonpy/__init__.py
-===================================================================
---- meson-python-0.13.2.orig/mesonpy/__init__.py
-+++ meson-python-0.13.2/mesonpy/__init__.py
-@@ -129,7 +129,7 @@ _STYLES = _init_colors() # holds the co
-
- _SUFFIXES = importlib.machinery.all_suffixes()
- _EXTENSION_SUFFIXES = importlib.machinery.EXTENSION_SUFFIXES
--_EXTENSION_SUFFIX_REGEX = re.compile(r'^\.(?:(?P<abi>[^.]+)\.)?(?:so|pyd|dll)$')
-+_EXTENSION_SUFFIX_REGEX = re.compile(r'^\.(?:(?P<abi>[^.]+)\.)?(?:so|pyd|dll|bundle)$')
- assert all(re.match(_EXTENSION_SUFFIX_REGEX, x) for x in _EXTENSION_SUFFIXES)
-
-
diff --git a/dev-python/meson-python/meson-python-0.13.2-r1.ebuild b/dev-python/meson-python/meson-python-0.13.2-r1.ebuild
deleted file mode 100644
index a6abd080a7af..000000000000
--- a/dev-python/meson-python/meson-python-0.13.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..12} 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="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
- >=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
- >=dev-util/meson-0.63.0[${PYTHON_USEDEP}]
- !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}]
- )
-"
-
-PATCHES=( "${FILESDIR}"/meson-python-0.13.2_Mach-O_bundle.patch )
-
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # requires network access
- tests/test_pep518.py::test_pep518
- # requires git repo
- # https://github.com/mesonbuild/meson-python/issues/397
- tests/test_project.py::test_user_args
- )
- unset NINJA
-
- if [[ ${EPYTHON} == pypy3 ]]; then
- EPYTEST_DESELECT+=(
- # broken venv usage that copies pypy3 executable, making it
- # unable to find lib_pypy
- tests/test_editable.py::test_editable_install
- tests/test_editable.py::test_editble_reentrant
- tests/test_examples.py::test_spam
- tests/test_wheel.py::test_local_lib
- )
- fi
-
- epytest
-
- rm -rf docs/examples/spam/build/ || die # remove artifacts
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/, dev-python/meson-python/files/
@ 2024-04-17 13:52 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2024-04-17 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 714b0f4460f2d9d0b41e81f80ddfa67a19929a48
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 13:44:26 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 13:52:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=714b0f44
dev-python/meson-python: Bump to 0.16.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/meson-python/Manifest | 1 +
...eson-python-0.16.0-pyproject-metadata-0.8.patch | 68 ++++++++++++++++++++++
dev-python/meson-python/meson-python-0.16.0.ebuild | 53 +++++++++++++++++
3 files changed, 122 insertions(+)
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 375d728e0b2c..bdef3c3bfc09 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1 +1,2 @@
DIST meson-python-0.15.0.gh.tar.gz 73063 BLAKE2B 280c01b08fb8264d268797d199b59f7d02cac88e49333de4a38f9e22a1e724586b7ffcddc4e9a411c0d660560892134cb742136334aad8caacd9db37580fce8f SHA512 f1fce89bb0a3d279b9900c4ecec78e5f24da92d72f64ebf6c27648b4201a75a65204c3fac08aaa3e8d70dbeef245c3235e39994c7c0b9cba27c0df528211c7f7
+DIST meson-python-0.16.0.gh.tar.gz 74975 BLAKE2B af74d62a4567bc0a7524e815f1bb4ef3ae7290ccea38c00c3b0013f5e7777d6a41c1631b0c1d83fdd930836599752e3bba3c381c137d275103409a986df4e040 SHA512 99ea4304f15e2e13adf031e7c8cacbbc48c0c80f42a81f9d84242b6279ac9c1a13e3f162be5f472a1e498dc7cf3cba6799bf765b3fd441ac10cd87dc0db38678
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
new file mode 100644
index 000000000000..834aed4d2fb4
--- /dev/null
+++ b/dev-python/meson-python/files/meson-python-0.16.0-pyproject-metadata-0.8.patch
@@ -0,0 +1,68 @@
+From ba14bfdffceb571a5e8c1406c76b7b77634bcb7f Mon Sep 17 00:00:00 2001
+From: Daniele Nicolodi <daniele@grinta.net>
+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.ebuild b/dev-python/meson-python/meson-python-0.16.0.ebuild
new file mode 100644
index 000000000000..f75822a30233
--- /dev/null
+++ b/dev-python/meson-python/meson-python-0.16.0.ebuild
@@ -0,0 +1,53 @@
+# 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..12} 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 ~ia64 ~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[${PYTHON_USEDEP}]
+ !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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-04-17 13:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-17 13:52 [gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/, dev-python/meson-python/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-10-06 19:05 Michał Górny
2023-07-17 1:18 Benda XU
2023-05-27 15:53 Michał Górny
2022-07-05 2:30 Sam James
2022-06-12 8:47 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox