1 |
commit: dd267aff1c6278d5895031a664388a9935874647 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 5 02:26:47 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 5 02:27:03 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd267aff |
7 |
|
8 |
dev-python/meson-python: drop 0.5.0-r1 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
dev-python/meson-python/Manifest | 1 - |
13 |
.../meson-python-0.5.0-pyproject-metadata.patch | 110 --------------------- |
14 |
.../meson-python/meson-python-0.5.0-r1.ebuild | 46 --------- |
15 |
3 files changed, 157 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest |
18 |
index 25059d789196..bfaef08c5220 100644 |
19 |
--- a/dev-python/meson-python/Manifest |
20 |
+++ b/dev-python/meson-python/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST meson-python-0.5.0.gh.tar.gz 30525 BLAKE2B f9afcb0edfdb06ce001b5185bf8c09de18a35d0f2d12f8fd69ed35cf17cc5e987c73724403fe1d6c44c80f1fad41b4b66b07b26e050b551673b3860a3d453a29 SHA512 e3941d258c5d16d0355752aff2f6458705a6af7d83850f679c5304d61699c393e186b9da2fe1a6405cb616a319250351e02ad81ddc8abf042f64c6b42b0be1cf |
23 |
DIST meson-python-0.6.0.gh.tar.gz 26783 BLAKE2B d5c5b95d5d609487a0efee1ce05b133794705cdb16f2d05d6e08b9201541e31f61a832c7770b4b5ad675f8dd91860c30c67769ce8fc0af2c48e65b0aad187ddb SHA512 25042ea030d2ad323c67daa0a520db936a4a4efa0de1c9f631c47fac22d797e01d1f1707ed407e2931164a35b3916e19a774ee16ab1d45fc91e41c75add57fa1 |
24 |
|
25 |
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 |
26 |
deleted file mode 100644 |
27 |
index fd96d942eb73..000000000000 |
28 |
--- a/dev-python/meson-python/files/meson-python-0.5.0-pyproject-metadata.patch |
29 |
+++ /dev/null |
30 |
@@ -1,110 +0,0 @@ |
31 |
-https://github.com/FFY00/meson-python/commit/678a586427088a58dfac15bb3fe89b3d7ff0178e |
32 |
-https://github.com/FFY00/meson-python/commit/c01645aa3617ccd424ef3ec052d13ac25e7df433 |
33 |
- |
34 |
-From 678a586427088a58dfac15bb3fe89b3d7ff0178e Mon Sep 17 00:00:00 2001 |
35 |
-From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@××××××.net> |
36 |
-Date: Thu, 9 Jun 2022 20:24:32 +0100 |
37 |
-Subject: [PATCH] mesonpy: replace pep621 dependency with pyproject-metadata |
38 |
-MIME-Version: 1.0 |
39 |
-Content-Type: text/plain; charset=UTF-8 |
40 |
-Content-Transfer-Encoding: 8bit |
41 |
- |
42 |
-Fixes #33 |
43 |
- |
44 |
-Signed-off-by: Filipe Laíns <lains@××××××.net> |
45 |
---- a/mesonpy/__init__.py |
46 |
-+++ b/mesonpy/__init__.py |
47 |
-@@ -46,7 +46,7 @@ |
48 |
- |
49 |
- |
50 |
- if typing.TYPE_CHECKING: # pragma: no cover |
51 |
-- import pep621 as _pep621 # noqa: F401 |
52 |
-+ import pyproject_metadata # noqa: F401 |
53 |
- import wheel.wheelfile # noqa: F401 |
54 |
- |
55 |
- |
56 |
-@@ -353,7 +353,7 @@ class Project(): |
57 |
- _ALLOWED_DYNAMIC_FIELDS: ClassVar[List[str]] = [ |
58 |
- 'version', |
59 |
- ] |
60 |
-- _metadata: Optional[_pep621.StandardMetadata] |
61 |
-+ _metadata: Optional[pyproject_metadata.StandardMetadata] |
62 |
- |
63 |
- def __init__( |
64 |
- self, |
65 |
-@@ -372,11 +372,11 @@ def __init__( |
66 |
- self._pep621 = 'project' in self._config |
67 |
- if self.pep621: |
68 |
- try: |
69 |
-- import pep621 # noqa: F811 |
70 |
-+ import pyproject_metadata # noqa: F811 |
71 |
- except ModuleNotFoundError: # pragma: no cover |
72 |
- self._metadata = None |
73 |
- else: |
74 |
-- self._metadata = pep621.StandardMetadata.from_pyproject(self._config, self._source_dir) |
75 |
-+ self._metadata = pyproject_metadata.StandardMetadata.from_pyproject(self._config, self._source_dir) |
76 |
- else: |
77 |
- print( |
78 |
- '{yellow}{bold}! Using Meson to generate the project metadata ' |
79 |
-@@ -550,8 +550,8 @@ def metadata(self) -> bytes: # noqa: C901 |
80 |
- Name: {self.name} |
81 |
- Version: {self.version} |
82 |
- ''').strip().encode() |
83 |
-- # re-import pep621 to raise ModuleNotFoundError if it is really missing |
84 |
-- import pep621 # noqa: F401, F811 |
85 |
-+ # re-import pyproject_metadata to raise ModuleNotFoundError if it is really missing |
86 |
-+ import pyproject_metadata # noqa: F401, F811 |
87 |
- assert self._metadata |
88 |
- # use self.version as the version may be dynamic -- fetched from Meson |
89 |
- core_metadata = self._metadata.as_rfc822() |
90 |
---- a/pyproject.toml |
91 |
-+++ b/pyproject.toml |
92 |
-@@ -4,7 +4,7 @@ backend-path = ['.'] |
93 |
- requires = [ |
94 |
- 'meson>=0.62.0', |
95 |
- 'ninja', |
96 |
-- 'pep621>=0.3.0', |
97 |
-+ 'pyproject-metadata>=0.5.0', |
98 |
- 'tomli>=1.0.0', |
99 |
- 'typing-extensions>=3.7.4; python_version<"3.8"', |
100 |
- ] |
101 |
-@@ -29,7 +29,7 @@ dependencies = [ |
102 |
- 'colorama; os_name == "nt"', |
103 |
- 'meson>=0.60.0', |
104 |
- 'ninja', |
105 |
-- 'pep621>=0.3.0', # not a hard dependency, only needed for projects that use PEP 621 metadata |
106 |
-+ 'pyproject-metadata>=0.5.0', # not a hard dependency, only needed for projects that use PEP 621 metadata |
107 |
- 'tomli>=1.0.0', |
108 |
- 'typing-extensions>=3.7.4; python_version<"3.8"', |
109 |
- ] |
110 |
-@@ -41,7 +41,6 @@ test = [ |
111 |
- 'pytest-mock', |
112 |
- 'GitPython', |
113 |
- 'auditwheel', |
114 |
-- 'pep621 >= 0.4.0', |
115 |
- ] |
116 |
- docs = [ |
117 |
- 'furo>=2021.08.31', |
118 |
- |
119 |
-From c01645aa3617ccd424ef3ec052d13ac25e7df433 Mon Sep 17 00:00:00 2001 |
120 |
-From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@××××××.net> |
121 |
-Date: Thu, 9 Jun 2022 20:27:49 +0100 |
122 |
-Subject: [PATCH] mesonpy: update code to pyproject-metadata 0.5.0 |
123 |
-MIME-Version: 1.0 |
124 |
-Content-Type: text/plain; charset=UTF-8 |
125 |
-Content-Transfer-Encoding: 8bit |
126 |
- |
127 |
-Signed-off-by: Filipe Laíns <lains@××××××.net> |
128 |
---- a/mesonpy/__init__.py |
129 |
-+++ b/mesonpy/__init__.py |
130 |
-@@ -424,9 +424,6 @@ def __init__( |
131 |
- # set version if dynamic (this fetches it from Meson) |
132 |
- if self._metadata and 'version' in self._metadata.dynamic: |
133 |
- self._metadata.version = self.version |
134 |
-- # version is no longer dynamic |
135 |
-- # XXX: Should this be automatically handled by pep621/pyproject-metadata? |
136 |
-- self._metadata.dynamic.remove('version') |
137 |
- |
138 |
- def _proc(self, *args: str) -> None: |
139 |
- print('{cyan}{bold}+ {}{reset}'.format(' '.join(args), **_STYLES)) |
140 |
- |
141 |
|
142 |
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 |
143 |
deleted file mode 100644 |
144 |
index 708c817c7349..000000000000 |
145 |
--- a/dev-python/meson-python/meson-python-0.5.0-r1.ebuild |
146 |
+++ /dev/null |
147 |
@@ -1,46 +0,0 @@ |
148 |
-# Copyright 2022 Gentoo Authors |
149 |
-# Distributed under the terms of the GNU General Public License v2 |
150 |
- |
151 |
-EAPI=8 |
152 |
- |
153 |
-DISTUTILS_USE_PEP517=standalone |
154 |
-PYTHON_COMPAT=( python3_{8..10} ) |
155 |
- |
156 |
-inherit distutils-r1 |
157 |
- |
158 |
-DESCRIPTION="Meson PEP 517 Python build backend" |
159 |
-HOMEPAGE=" |
160 |
- https://pypi.org/project/meson-python/ |
161 |
- https://github.com/FFY00/meson-python/ |
162 |
-" |
163 |
-SRC_URI=" |
164 |
- https://github.com/FFY00/meson-python/archive/${PV}.tar.gz |
165 |
- -> ${P}.gh.tar.gz |
166 |
-" |
167 |
- |
168 |
-LICENSE="EUPL-1.2" |
169 |
-SLOT="0" |
170 |
-KEYWORDS="~amd64" |
171 |
- |
172 |
-RDEPEND=" |
173 |
- >=dev-python/pyproject-metadata-0.3.0[${PYTHON_USEDEP}] |
174 |
- >=dev-python/tomli-1.0.0[${PYTHON_USEDEP}] |
175 |
- >=dev-util/meson-0.60.0[${PYTHON_USEDEP}] |
176 |
-" |
177 |
-BDEPEND=" |
178 |
- test? ( |
179 |
- dev-python/GitPython[${PYTHON_USEDEP}] |
180 |
- dev-python/pytest-mock[${PYTHON_USEDEP}] |
181 |
- dev-util/patchelf |
182 |
- ) |
183 |
-" |
184 |
- |
185 |
-PATCHES=( |
186 |
- "${FILESDIR}"/${P}-pyproject-metadata.patch |
187 |
- "${FILESDIR}"/${PN}-0.5.0-defaults.patch |
188 |
-) |
189 |
- |
190 |
-distutils_enable_sphinx docs \ |
191 |
- dev-python/furo \ |
192 |
- dev-python/sphinx-autodoc-typehints |
193 |
-distutils_enable_tests pytest |