8000 BLD: unvendor meson-python · numpy/numpy@b44ae7e · GitHub
[go: up one dir, main page]

Skip to content

Commit b44ae7e

Browse files
committed
BLD: unvendor meson-python
The meson-python 0.15.0 release added the ability to configure a custom `meson` in `pyproject.toml`. So there's no longer a need for us to vendor it.
1 parent a3ec20a commit b44ae7e

File tree

4 files changed

+4
-19
lines changed

4 files changed

+4
-19
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,3 @@
1010
[submodule "vendored-meson/meson"]
1111
path = vendored-meson/meson
1212
url = https://github.com/numpy/meson.git
13-
[submodule "vendored-meson/meson-python"]
14-
path = vendored-meson/meson-python
15-
url = https://github.com/numpy/meson-python.git

LICENSES_bundled.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ Files: vendored-meson/meson/*
2525
License: Apache 2.0
2626
For license text, see vendored-meson/meson/COPYING
2727

28-
Name: meson-python
29-
Files: vendored-meson/meson-python/*
30-
License: MIT
31-
For license text, see vendored-meson/meson-python/LICENSE
32-
3328
Name: spin
3429
Files: .spin/cmds.py
3530
License: BSD-3

pyproject.toml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,8 @@
22
build-backend = "mesonpy"
33
backend-path = ['./vendored-meson/meson-python']
44
requires = [
5+
"meson-python>=0.15.0",
56
"Cython>=3.0",
6-
# All dependencies of the vendored meson-python (except for meson, because
7-
# we've got that vendored too - that's the point of this exercise).
8-
'pyproject-metadata >= 0.7.1',
9-
'tomli >= 1.0.0; python_version < "3.11"',
10-
'setuptools >= 60.0; python_version >= "3.12"',
11-
'colorama; os_name == "nt"',
12-
# Note that `ninja` and (on Linux) `patchelf` are added dynamically by
13-
# meson-python if those tools are not already present on the system. No
14-
# need to worry about those unless one does a non-isolated build - in that
15-
# case they must already be installed on the system.
167
]
178

189
[project]
@@ -190,6 +181,9 @@ environment = {PKG_CONFIG_PATH="/opt/32/lib/pkgconfig"}
190181
config-settings = "setup-args=--vsenv setup-args=-Dallow-noblas=true"
191182
repair-wheel-command = ""
192183

184+
[tool.meson-python]
185+
meson = 'vendored-meson/meson/meson.py'
186+
193187
[tool.spin]
194188
package = 'numpy'
195189

vendored-meson/meson-python

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)
0