Skip to content
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.

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

Use meson-python main branch #6671

Merged
merged 3 commits into from Jan 17, 2023

Conversation

jarrodmillman
Copy link
Contributor

See #6667

Description

Checklist

  • Docstrings for all functions
  • Gallery example in ./doc/examples (new features only)
  • Benchmark in ./benchmarks, if your changes aren't covered by an
    existing benchmark
  • Unit tests
  • Clean style in the spirit of PEP8
  • Descriptive commit messages (see below)

For reviewers

  • Check that the PR title is short, concise, and will make sense 1 year
    later.
  • Check that new functions are imported in corresponding __init__.py.
  • Check that new features, API changes, and deprecations are mentioned in
    doc/release/release_dev.rst.
  • There is a bot to help automate backporting a PR to an older branch. For
    example, to backport to v0.19.x after merging, add the following in a PR
    comment: @meeseeksdev backport to v0.19.x
  • To run benchmarks on a PR, add the run-benchmark label. To rerun, the label
    can be removed and then added again. The benchmark output can be checked in
    the "Actions" tab.

@@ -1,4 +1,4 @@
meson-python>=0.11.0
git+https://github.com/mesonbuild/meson-python

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is enough to make cibuildwheel use meson-python from git. The easiest is probably to patch pyproject.toml's [build-system] section.

@stefanv
Copy link
Member

stefanv commented Jan 16, 2023

@jarrodmillman also see the branch I pushed to maintenance last night.

@dnicolodi
Copy link

dnicolodi commented Jan 16, 2023

@stefanv Your approach does not work with cibuildwheel either. Patching pyproject.toml is really the easiest solution

pyproject.toml Outdated
@@ -44,7 +44,7 @@ tracker = "https://github.com/scikit-image/scikit-image/issues"
[build-system]
build-backend = "mesonpy"
requires = [
"meson-python>=0.11.0",
"git+https://github.com/mesonbuild/meson-python",
Copy link

@dnicolodi dnicolodi Jan 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The correct syntax is meson-python @ git+https://github.com/mesonbuild/meson-python. I would also pin the version, in case future commits to the meson-python git repository break something:

meson-python @ git+https://github.com/mesonbuild/meson-python@babdf709618fbeeaf59634bc2b4331ca5f7924ce"

@stefanv stefanv merged commit 8b376e5 into scikit-image:main Jan 17, 2023
@jarrodmillman jarrodmillman added this to the 0.20 milestone Jan 18, 2023
@jarrodmillman jarrodmillman deleted the meson-python-main branch February 17, 2023 19:06
@lagru lagru added the 🔧 type: Maintenance Refactoring and maintenance of internals label Feb 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🔧 type: Maintenance Refactoring and maintenance of internals
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants