Skip to content

Commit

Permalink
BLD: unvendor meson-python [wheel build]
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
rgommers committed Oct 26, 2023
1 parent 9b38c63 commit 6544e33
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 70 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,3 @@
[submodule "vendored-meson/meson"]
path = vendored-meson/meson
url = https://github.com/numpy/meson.git
[submodule "vendored-meson/meson-python"]
path = vendored-meson/meson-python
url = https://github.com/numpy/meson-python.git
5 changes: 0 additions & 5 deletions LICENSES_bundled.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ Files: vendored-meson/meson/*
License: Apache 2.0
For license text, see vendored-meson/meson/COPYING

Name: meson-python
Files: vendored-meson/meson-python/*
License: MIT
For license text, see vendored-meson/meson-python/LICENSE

Name: spin
Files: .spin/cmds.py
License: BSD-3
Expand Down
15 changes: 4 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
[build-system]
build-backend = "mesonpy"
backend-path = ['./vendored-meson/meson-python']
requires = [
"meson-python>=0.15.0",
"Cython>=3.0",
# All dependencies of the vendored meson-python (except for meson, because
# we've got that vendored too - that's the point of this exercise).
'pyproject-metadata >= 0.7.1',
'tomli >= 1.0.0; python_version < "3.11"',
'setuptools >= 60.0; python_version >= "3.12"',
'colorama; os_name == "nt"',
# Note that `ninja` and (on Linux) `patchelf` are added dynamically by
# meson-python if those tools are not already present on the system. No
# need to worry about those unless one does a non-isolated build - in that
# case they must already be installed on the system.
]

[project]
Expand Down Expand Up @@ -190,6 +180,9 @@ environment = {PKG_CONFIG_PATH="/opt/32/lib/pkgconfig"}
config-settings = "setup-args=--vsenv setup-args=-Dallow-noblas=true"
repair-wheel-command = ""

[tool.meson-python]
meson = 'vendored-meson/meson/meson.py'

[tool.spin]
package = 'numpy'

Expand Down
27 changes: 0 additions & 27 deletions vendored-meson/build-backend-wrapper/npbuild/__init__.py

This file was deleted.

23 changes: 0 additions & 23 deletions vendored-meson/entrypoint/meson

This file was deleted.

1 change: 0 additions & 1 deletion vendored-meson/meson-python
Submodule meson-python deleted from 206a31

0 comments on commit 6544e33

Please sign in to comment.