Skip to content

Commit

Permalink
MAINT: bump minimum required Meson version to 0.64.0
Browse files Browse the repository at this point in the history
Depending on 0.64.0 or later allows to use the pure argument when
invoking the import('python').find_installation() Meson function,
which makes for some nicer test and example code. Meson 0.64.0 was
released on November 6th, 2022, just over a month after the current
minimum supported version.
  • Loading branch information
dnicolodi authored and rgommers committed Oct 29, 2024
1 parent 9faca83 commit 5e96ca7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 25 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/tests.yml
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
4 changes: 2 additions & 2 deletions docs/reference/meson-compatibility.rst
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 Down
4 changes: 2 additions & 2 deletions pyproject.toml
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
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,
)

0 comments on commit 5e96ca7

Please sign in to comment.