Merge branch 'main' into ios-support

Author: freakboy3742

CHANGELOG.rst

@@ -11,6 +11,35 @@
 Changelog
 +++++++++
 
+0.18.0
+======
+
+- Drop Python 3.7 support.
+- Bump minimum required Meson version to 0.64.0.
+- Bump minimum required ``pyproject-metadata`` version to 0.9.0 to enable
+  support for PEP 639.
+- Bump minimum required ``packaging`` version to 23.2. ``pyproject-metadata``
+  version 0.9.1 requires this version of ``packaging`` but fails to record the
+  version requirement in the package metadata. Enforcing the version
+  requirement in ``meson-python`` allows fixing possible dependency problems
+  without having ``meson-python`` depend on a very recent
+  ``pyproject-metadata`` release.
+- Add support for PEP 639 metadata fields. Canonicalization and validation of
+  the license expression requires ``packaging`` version 24.2 or later.
+- Add support for declaring the ``licence`` and ``license-files`` as dynamic
+  fields in ``pyproject.toml`` to extract the package license and license
+  files from the ones declared via the ``project()`` call in
+  ``meson.build``. This requires Meson version 1.6.0 or later.
+- Add support for ``RPATH`` handling on SunOS.
+- Include shared libraries built as part of the Meson project in the Python
+  wheels also on Windows, when explicitly enabled via the
+  ``tool.meson-python.allow-windows-internal-shared-libs`` project setting.
+- Add support for symbolic links that point to files within the source tree.
+  They are now included as regular files in the sdist archive.
+
+Daniele Nicolodi, Marcel Telka, Ralf Gommers --- 30-04-2025.
+
+
 0.17.1
 ======
 
@@ -19,6 +48,7 @@ Changelog
 
 Daniele Nicolodi --- 23-10-2024.
 
+
 0.17.0
 ======
 
@@ -45,6 +75,7 @@ Daniele Nicolodi --- 23-10-2024.
 Christian Clauss, Daniele Nicolodi, Jonathan J. Helmus, Leo Singer, Loïc
 Estève, Michael Simacek, Ralf Gommers, Simon McVittie --- 19-10-2024.
 
+
 0.16.0
 ======
 

docs/reference/meson-compatibility.rst

@@ -50,8 +50,7 @@ versions.
    Meson 1.6.0 or later is required to support ``license`` and
    ``license-files`` dynamic fields in ``pyproject.toml`` and to
    populate the package license and license files from the ones
-   declared via the ``project()`` call in ``meson.build``. This also
-   requires ``pyproject-metadata`` version 0.9.0 or later.
+   declared via the ``project()`` call in ``meson.build``.
 
 Build front-ends by default build packages in an isolated Python
 environment where build dependencies are installed. Most often, unless

mesonpy/__init__.py

@@ -14,6 +14,7 @@
 import argparse
 import collections
 import contextlib
+import copy
 import difflib
 import functools
 import importlib.machinery
@@ -23,6 +24,7 @@
 import os
 import pathlib
 import platform
+import posixpath
 import re
 import shutil
 import subprocess
@@ -79,7 +81,7 @@ class InvalidLicenseExpression(Exception):  # type: ignore[no-redef]
     MesonArgs = Mapping[MesonArgsKeys, List[str]]
 
 
-__version__ = '0.18.0.dev0'
+__version__ = '0.18.0'
 
 
 _PYPROJECT_METADATA_VERSION = tuple(map(int, pyproject_metadata.__version__.split('.')[:2]))
@@ -961,6 +963,33 @@ def sdist(self, directory: Path) -> pathlib.Path:
 
         with tarfile.open(meson_dist_path, 'r:gz') as meson_dist, mesonpy._util.create_targz(sdist_path) as sdist:
             for member in meson_dist.getmembers():
+                # Recursively resolve symbolic links.  The source distribution
+                # archive format specification allows for symbolic links as
+                # long as the target path does not include a '..' component.
+                # This makes symbolic links support unusable in most cases,
+                # therefore include the symbolic link targets as regular files
+                # in all cases.
+                while member.issym():
+                    name = member.name
+                    target = posixpath.normpath(posixpath.join(posixpath.dirname(member.name), member.linkname))
+                    try:
+                        # This can be implemented using the .replace() method
+                        # in Python 3.12 and later. The .replace() method was
+                        # added as part of PEP 706 and back-ported to Python
+                        # 3.9 and later in patch releases, thus it cannot be
+                        # relied upon until the minimum supported Python
+                        # version is 3.12.
+                        member = copy.copy(meson_dist.getmember(target))
+                        member.name = name
+                    except KeyError:
+                        warnings.warn(
+                            'symbolic link with absolute path target, pointing outside the '
+                            f'archive, or dangling ignored: {name}', stacklevel=1)
+                        break
+                    if member.isdir():
+                        warnings.warn(
+                            f'symbolic link pointing to a directory ignored: {name}', stacklevel=1)
+
                 if member.isfile():
                     file = meson_dist.extractfile(member.name)
 
@@ -995,6 +1024,10 @@ def sdist(self, directory: Path) -> pathlib.Path:
 
                     sdist.addfile(member, file)
 
+                elif not member.isdir() and not member.issym():
+                    warnings.warn(
+                        f'special file in the source archive ignored: {member.name}', stacklevel=1)
+
             # Add 'PKG-INFO'.
             member = tarfile.TarInfo(f'{dist_name}/PKG-INFO')
             member.uid = member.gid = 0

pyproject.toml

@@ -16,11 +16,12 @@ requires = [
 
 [project]
 name = 'meson-python'
-version = '0.18.0.dev0'
+version = '0.18.0'
 description = 'Meson Python build backend (PEP 517)'
 readme = 'README.rst'
 requires-python = '>= 3.8'
-license = { file = 'LICENSES/MIT.txt' }
+license = 'MIT'
+license-files = ['LICENSES/MIT.txt']
 keywords = ['meson', 'build', 'backend', 'pep517', 'package']
 maintainers = [
   { name = 'Ralf Gommers', email = '[email protected]' },

tests/packages/symlinks/__init__.py

@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2025 The meson-python developers
+#
+# SPDX-License-Identifier: MIT

tests/packages/symlinks/baz.py

@@ -0,0 +1 @@
+/__init__.py

tests/packages/symlinks/meson.build

@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: 2025 The meson-python developers
+#
+# SPDX-License-Identifier: MIT
+
+project('symlinks', version: '1.0.0')
+
+py = import('python').find_installation()
+
+py.install_sources(
+    '__init__.py',
+    'submodule/__init__.py',
+    'submodule/aaa.py',
+    'submodule/bbb.py',
+    subdir: 'symlinks',
+    preserve_path: true,
+)

tests/packages/symlinks/pyproject.toml

@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: 2021 The meson-python developers
+#
+# SPDX-License-Identifier: MIT
+
+[build-system]
+build-backend = 'mesonpy'
+requires = ['meson-python']

tests/packages/symlinks/qux.py

@@ -0,0 +1 @@
+../__init__.py

tests/packages/symlinks/submodule/__init__.py

@@ -0,0 +1 @@
+../__init__.py