8000 BLD: unvendor meson-python by rgommers · Pull Request #25008 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BLD: unvendor meson-python #25008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Oct 26, 2023
Merged

BLD: unvendor meson-python #25008

merged 4 commits into from
Oct 26, 2023

Conversation

rgommers
Copy link
Member

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.

@rgommers rgommers added this to the 2.0.0 release milestone Oct 26, 2023
@github-actions github-actions bot added the 36 - Build Build related PR label Oct 26, 2023
@rgommers rgommers force-pushed the unvendor-meson-python branch from b44ae7e to 152d8f5 Compare October 26, 2023 10:58
@rgommers
Copy link
Member Author

Python 3.12 failures:

  meson.build:40:22: ERROR: <PythonExternalProgram 'python3' -> ['/opt/hostedtoolcache/Python/3.12.0/x64/bin/python']> is not a valid python or it is missing distutils

The vendored Meson needs an update so that we're getting the fixes in Meson 1.2.3 to avoid distutils/setuptools completely.

@rgommers
BLD: update vendored meson (merge with Meson 1.2.3)
961ef96
@rgommers
BLD: remove last usage of distutils in _core/code_generators/
9b38c63
@rgommers
BLD: unvendor meson-python [wheel build]
6544e33 
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.
@rgommers rgommers force-pushed the unvendor-meson-python branch from 152d8f5 to 6544e33 Compare October 26, 2023 15:56
@rgommers
Copy link
Member Author

Almost victory - a single test error left in the "without optimizations" job of linux_simd.yml:

  ----------------------------- Captured stderr call -----------------------------
  Traceback (most recent call last):
    File "/tmp/pytest-of-runner/pytest-0/test_limited_api0/limited_api/setup.py", line 6, in <module>
      from setuptools import setup, Extension
  ModuleNotFoundError: No module named 'setuptools'
  =========================== short test summary info ============================
  FAILED numpy/_core/tests/test_limited_api.py::test_limited_api - subprocess.CalledProcessError: Command '['/opt/hostedtoolcache/Python/3.12.0/x64/bin/python', 'setup.py', 'build', 'install', '--prefix', '/tmp/pytest-of-runner/pytest-0/test_limited_api0/installdir', '--single-version-externally-managed', '--record', '/tmp/pytest-of-runner/pytest-0/test_limited_api0/tmp_install_log.txt']' returned non-zero exit status 1.

That's because on 3.12 we no longer install setuptools as a build dependency, and it's needed as a test dependency there. Should be fixed by the last commit.

@rgommers
Copy link
Member Author

Victory! This is ready to merge.

@charris charris merged commit 450f330 into numpy:main Oct 26, 2023
@charris
Copy link
Member
charris commented Oct 26, 2023

Thanks Ralf.

@rgommers rgommers deleted the unvendor-meson-python branch October 26, 2023 20:48
@rgommers rgommers mentioned this pull request Oct 27, 2023
Closed
This was referenced Oct 31, 2023
Merged
Merged
@charris charris added the 09 - Backport-Candidate PRs tagged should be backported label Nov 7, 2023
@charris charris modified the milestones: 2.0.0 release, 1.26.3 release Nov 12, 2023
@charris charris removed the 09 - Backport-Candidate PRs tagged should be backported label Jan 18, 2024
@rgommers rgommers mentioned this pull request Feb 2, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
36 - Build Build related PR component: build
Projects
None yet
Milestone
1.26.3 release
Development

Successfully merging this pull request may close these issues.
2 participants
@rgommers @charris
0