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.

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

MAINT: bump minimum required Meson version to 0.64.0 #701

Merged
merged 2 commits into from
Oct 29, 2024
Merged

MAINT: bump minimum required Meson version to 0.64.0 #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ace72d
MAINT: bump minimum required Meson version to 0.64.0
dnicolodi Oct 28, 2024
aff5b30
DOC: Meson 1.2.0 or later is required for --skip-subprojects support
dnicolodi Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@ jobs:
# Test with older supported Meson version. Meson up to
# version 1.2.3 requires distutils, which has been removed
# from the stdlib in Python 3.12, thus test with Pythn 3.11.
- os: ubuntu-latest
python: '3.11'
meson: '~=0.63.3'
- os: ubuntu-latest
python: '3.11'
meson: '~=0.64.0'
Expand Down
10 changes: 8 additions & 2 deletions docs/reference/meson-compatibility.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ maintain compatibility with as old as possible Meson releases.
However, some functionality is available only with more recent Meson
versions.

.. option:: 0.63.3
.. option:: 0.64.0

Meson is 0.63.3 is the minimum required version.
Meson is 0.64.0 is the minimum required version.

.. option:: 1.1.0

Expand All @@ -26,6 +26,12 @@ versions.
and similar installation functions. On older Meson versions, these
arguments have no effect.

.. option:: 1.2.0

Meson 1.2.0 or later is required to support the ``--skip-subprojects``
option that can be passed to ``meson install`` to not include files
installed by some or all subprojects in the Python wheel.

.. option:: 1.2.3

Meson 1.2.3 or later is required to support Python 3.12 or later.
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
build-backend = 'mesonpy'
backend-path = ['.']
requires = [
'meson >= 0.63.3; python_version < "3.12"',
'meson >= 0.64.0; python_version < "3.12"',
'meson >= 1.2.3; python_version >= "3.12"',
'packaging >= 19.0',
'pyproject-metadata >= 0.8.0',
Expand Down Expand Up @@ -34,7 +34,7 @@ classifiers = [
]

dependencies = [
'meson >= 0.63.3; python_version < "3.12"',
'meson >= 0.64.0; python_version < "3.12"',
'meson >= 1.2.3; python_version >= "3.12"',
'packaging >= 19.0',
'pyproject-metadata >= 0.8.0',
Expand Down
19 changes: 1 addition & 18 deletions tests/packages/subdirs/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,7 @@ project('subdirs', version: '1.0.0')

py = import('python').find_installation()

# in Meson >= 0.64 this could be replace with a single
# py.install_sources() with the 'preserve_path: true' argument.
py.install_sources(
'subdirs/__init__.py',
subdir: 'subdirs',
)

py.install_sources(
'subdirs/a/__init__.py',
subdir: 'subdirs/a',
)

py.install_sources(
'subdirs/a/b/c.py',
subdir: 'subdirs/a/b',
)

py.install_sources(
'subdirs/b/c.py',
subdir: 'subdirs/b',
preserve_path: true,
)
Loading