meson-python 0.13.0__tar.gz → 0.13.1__tar.gz

{meson_python-0.13.0 → meson_python-0.13.1}/CHANGELOG.rst

@@ -12,6 +12,25 @@ Change-log
 ++++++++++
 
 
+0.13.1
+======
+
+- Fix regression in cross-compilation via ``$ARCHFLAGS`` on macOS where the
+  cross file was written in the build directory before it was created,
+  resulting in an error.
+- Do not require setting ``$_PYTHON_HOST_PLATFORM`` when cross-compiling via
+  ``$ARCHFLAGS`` on macOS.
+- Add the ``--quiet`` option when invoking ``meson install``. The installation
+  paths are a detail of the ``meson-python`` implementation and are generally
+  not interesting for the user.
+- Fix terminal logging when overriding the current line when listing files
+  added to the wheel.
+- Improve the error message emitted when a package split between the
+  ``purelib`` and ``platlib`` wheel locations is detected.
+
+Daniele Nicolodi, Ralf Gommers --- 28-04-2023.
+
+
 0.13.0
 ======
 

{meson_python-0.13.0 → meson_python-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meson-python
-Version: 0.13.0
+Version: 0.13.1
 Summary: Meson Python build backend (PEP 517)
 Keywords: meson build backend pep517 package
 Home-page: https://github.com/mesonbuild/meson-python

{meson_python-0.13.0 → meson_python-0.13.1}/docs/changelog.rst

@@ -12,6 +12,25 @@ Change-log
 ++++++++++
 
 
+0.13.1
+======
+
+- Fix regression in cross-compilation via ``$ARCHFLAGS`` on macOS where the
+  cross file was written in the build directory before it was created,
+  resulting in an error.
+- Do not require setting ``$_PYTHON_HOST_PLATFORM`` when cross-compiling via
+  ``$ARCHFLAGS`` on macOS.
+- Add the ``--quiet`` option when invoking ``meson install``. The installation
+  paths are a detail of the ``meson-python`` implementation and are generally
+  not interesting for the user.
+- Fix terminal logging when overriding the current line when listing files
+  added to the wheel.
+- Improve the error message emitted when a package split between the
+  ``purelib`` and ``platlib`` wheel locations is detected.
+
+Daniele Nicolodi, Ralf Gommers --- 28-04-2023.
+
+
 0.13.0
 ======
 

{meson_python-0.13.0 → meson_python-0.13.1}/docs/security.rst

@@ -14,6 +14,7 @@ repository_, or the source distributions on the `meson-python PyPI page`_, both
 are PGP-signed with one of the following keys:
 
 - |3DCE51D60930EBA47858BA4146F633CBB0EB4BF2|_ *(Filipe Laíns)*
+- |52BDC33FD1FBAB569D47FFA923D9E5499A08BDC5|_ *(Ralf Gommers)*
 
 
 .. admonition:: Fetching artifact signatures from PyPI_
@@ -30,3 +31,6 @@ are PGP-signed with one of the following keys:
 
 .. |3DCE51D60930EBA47858BA4146F633CBB0EB4BF2| replace:: ``3DCE51D60930EBA47858BA4146F633CBB0EB4BF2``
 .. _3DCE51D60930EBA47858BA4146F633CBB0EB4BF2: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3dce51d60930eba47858ba4146f633cbb0eb4bf2
+
+.. |52BDC33FD1FBAB569D47FFA923D9E5499A08BDC5| replace:: ``52BDC33FD1FBAB569D47FFA923D9E5499A08BDC5``
+.. _52BDC33FD1FBAB569D47FFA923D9E5499A08BDC5: https://github.com/rgommers.gpg

{meson_python-0.13.0 → meson_python-0.13.1}/meson.build

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-project('meson-python', version: '0.13.0')
+project('meson-python', version: '0.13.1')
 
 py_mod = import('python')
 py = py_mod.find_installation()

{meson_python-0.13.0 → meson_python-0.13.1}/mesonpy/__init__.py

@@ -66,7 +66,7 @@ if typing.TYPE_CHECKING:  # pragma: no cover
     T = TypeVar('T')
 
 
-__version__ = '0.13.0'
+__version__ = '0.13.1'
 
 
 # XXX: Once Python 3.8 is our minimum supported version, get rid of
@@ -170,7 +170,8 @@ def _map_to_wheel(sources: Dict[str, Dict[str, Any]]) -> DefaultDict[str, List[T
                     that = os.fspath(other / next(d for d, s in wheel_files[other] if d.parts[0] == destination.parts[1]))
                     raise BuildError(
                         f'The {package} package is split between {path} and {other}: '
-                        f'{this!r} and {that!r}, a "pure: false" argument may be missing in meson.build')
+                        f'{this!r} and {that!r}, a "pure: false" argument may be missing in meson.build. '
+                        f'It is recommended to set it in "import(\'python\').find_installation()"')
 
             wheel_files[path].append((pathlib.Path(*destination.parts[1:]), src))
     return wheel_files
@@ -499,7 +500,6 @@ class _WheelBuilder():
         with mesonpy._wheelfile.WheelFile(wheel_file, 'w') as whl:
             self._wheel_write_metadata(whl)
 
-            print('{light_blue}{bold}Copying files to wheel...{reset}'.format(**_STYLES))
             with mesonpy._util.cli_counter(
                 len(list(itertools.chain.from_iterable(self._wheel_files.values()))),
             ) as counter:
@@ -648,25 +648,28 @@ class Project():
         self._meson_native_file = self._build_dir / 'meson-python-native-file.ini'
         self._meson_cross_file = self._build_dir / 'meson-python-cross-file.ini'
         self._meson_args: MesonArgs = collections.defaultdict(list)
-        self._env = os.environ.copy()
 
         _check_meson_version()
 
         self._ninja = _env_ninja_command()
         if self._ninja is None:
             raise ConfigError(f'Could not find ninja version {_NINJA_REQUIRED_VERSION} or newer.')
-        self._env.setdefault('NINJA', self._ninja)
+        os.environ.setdefault('NINJA', self._ninja)
+
+        # make sure the build dir exists
+        self._build_dir.mkdir(exist_ok=True, parents=True)
+        self._install_dir.mkdir(exist_ok=True, parents=True)
 
         # setuptools-like ARCHFLAGS environment variable support
         if sysconfig.get_platform().startswith('macosx-'):
-            archflags = self._env.get('ARCHFLAGS', '').strip()
+            archflags = os.environ.get('ARCHFLAGS', '').strip()
             if archflags:
                 arch, *other = filter(None, (x.strip() for x in archflags.split('-arch')))
                 if other:
                     raise ConfigError(f'Multi-architecture builds are not supported but $ARCHFLAGS={archflags!r}')
                 macver, _, nativearch = platform.mac_ver()
                 if arch != nativearch:
-                    x = self._env.setdefault('_PYTHON_HOST_PLATFORM', f'macosx-{macver}-{arch}')
+                    x = os.environ.setdefault('_PYTHON_HOST_PLATFORM', f'macosx-{macver}-{arch}')
                     if not x.endswith(arch):
                         raise ConfigError(f'$ARCHFLAGS={archflags!r} and $_PYTHON_HOST_PLATFORM={x!r} do not agree')
                     family = 'aarch64' if arch == 'arm64' else arch
@@ -697,10 +700,6 @@ class Project():
             for key, value in meson_args.items():
                 self._meson_args[key].extend(value)
 
-        # make sure the build dir exists
-        self._build_dir.mkdir(exist_ok=True, parents=True)
-        self._install_dir.mkdir(exist_ok=True, parents=True)
-
         # write the native file
         native_file_data = textwrap.dedent(f'''
             [binaries]
@@ -733,8 +732,11 @@ class Project():
 
     def _run(self, cmd: Sequence[str]) -> None:
         """Invoke a subprocess."""
-        print('{cyan}{bold}+ {}{reset}'.format(' '.join(cmd), **_STYLES))
-        r = subprocess.run(cmd, env=self._env, cwd=self._build_dir)
+        # Flush the line to ensure that the log line with the executed
+        # command line appears before the command output. Without it,
+        # the lines appear in the wrong order in pip output.
+        print('{cyan}{bold}+ {}{reset}'.format(' '.join(cmd), **_STYLES), flush=True)
+        r = subprocess.run(cmd, cwd=self._build_dir)
         if r.returncode != 0:
             raise SystemExit(r.returncode)
 
@@ -813,7 +815,7 @@ class Project():
     def install(self) -> None:
         """Install the Meson project."""
         destdir = os.fspath(self._install_dir)
-        self._run(['meson', 'install', '--no-rebuild', '--destdir', destdir, *self._meson_args['install']])
+        self._run(['meson', 'install', '--quiet', '--no-rebuild', '--destdir', destdir, *self._meson_args['install']])
 
     @classmethod
     @contextlib.contextmanager

{meson_python-0.13.0 → meson_python-0.13.1}/mesonpy/_util.py

@@ -8,6 +8,7 @@ from __future__ import annotations
 
 import contextlib
 import gzip
+import itertools
 import os
 import sys
 import tarfile
@@ -73,22 +74,18 @@ def create_targz(path: Path) -> Iterator[Tuple[tarfile.TarFile, Optional[int]]]:
 class CLICounter:
     def __init__(self, total: int) -> None:
         self._total = total - 1
-        self._count = -1
-        self._current_line = ''
+        self._count = itertools.count()
 
     def update(self, description: str) -> None:
-        self._count += 1
-        new_line = f'[{self._count}/{self._total}] {description}'
+        line = f'[{next(self._count)}/{self._total}] {description}'
         if sys.stdout.isatty():
-            pad_size = abs(len(self._current_line) - len(new_line))
-            print(' ' + new_line + ' ' * pad_size, end='\r', flush=True)
+            print('\r', line, sep='', end='\33[0K', flush=True)
         else:
-            print(new_line)
-        self._current_line = new_line
+            print(line)
 
     def finish(self) -> None:
         if sys.stdout.isatty():
-            print(f'\r{self._current_line}')
+            print()
 
 
 @contextlib.contextmanager

{meson_python-0.13.0 → meson_python-0.13.1}/tests/conftest.py

@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: MIT
 
-import atexit
 import contextlib
 import os
 import os.path
@@ -75,24 +74,6 @@ def tmp_path_session(tmp_path_factory):
     ))
 
 
-@pytest.fixture
-def tmp_build_path():
-    # Similar to the tmp_path fixture but ensures that the temporary
-    # directory is on the same Windows drive as the test packages
-    # source directory. This is required to work around a Cython bug
-    # exposed in our test packages. See https://github.com/cython/cython/pull/5279
-    tmpdir = tempfile.mkdtemp(prefix='.build-', dir=package_dir)
-    # The clenup is implemented with an atexit hook rather than with a
-    # regular context manager because we import extension modules from
-    # the build directory in the tests and these need to stay around
-    # till the Python interpreter is being teared down. Orherwise
-    # PermissionError removing the folder are obtained on Windows, but
-    # more importantly, the removal succeeds on Cygwin but memory
-    # mapping errors are obtained when Python tries to fork().
-    atexit.register(shutil.rmtree, tmpdir, ignore_errors=True)
-    yield pathlib.Path(tmpdir)
-
-
 class VEnv(EnvBuilder):
     def __init__(self, env_dir):
         super().__init__(with_pip=True)
@@ -175,8 +156,8 @@ def disable_pip_version_check():
 
 @pytest.fixture(scope='session')
 def pep518_wheelhouse(tmp_path_factory):
-    wheelhouse = tmp_path_factory.mktemp('wheelhouse')
-    meson_python = str(package_dir.parent.parent)
+    wheelhouse = os.fspath(tmp_path_factory.mktemp('wheelhouse'))
+    meson_python = os.fspath(package_dir.parent.parent)
     # Populate wheelhouse with wheel for the following packages and
     # their dependencies.  Wheels are downloaded from PyPI or built
     # from the source distribution as needed.  Sources or wheels in
@@ -184,8 +165,9 @@ def pep518_wheelhouse(tmp_path_factory):
     packages = [
         meson_python,
     ]
-    subprocess.run([sys.executable, '-m', 'pip', 'wheel', '--wheel-dir', str(wheelhouse), *packages], check=True)
-    return str(wheelhouse)
+    cmd = [sys.executable, '-m', 'pip', 'wheel', '--no-build-isolation', '--wheel-dir', wheelhouse, *packages]
+    subprocess.run(cmd, check=True)
+    return wheelhouse
 
 
 @pytest.fixture

{meson_python-0.13.0 → meson_python-0.13.1}/tests/test_editable.py

@@ -58,10 +58,10 @@ def test_collect(package_complex):
     assert tree['complex']['more']['__init__.py'] == os.path.join(root, 'complex', 'more', '__init__.py')
 
 
-def test_mesonpy_meta_finder(package_complex, tmp_build_path):
+def test_mesonpy_meta_finder(package_complex, tmp_path):
     # build a package in a temporary directory
-    mesonpy.Project(package_complex, tmp_build_path)
-    build_path = tmp_build_path / 'build'
+    mesonpy.Project(package_complex, tmp_path)
+    build_path = tmp_path / 'build'
 
     # point the meta finder to the build directory
     finder = _editable.MesonpyMetaFinder({'complex'}, os.fspath(build_path), ['ninja'])

{meson_python-0.13.0 → meson_python-0.13.1}/tests/test_project.py

@@ -19,7 +19,7 @@ import pytest
 
 import mesonpy
 
-from .conftest import chdir, package_dir
+from .conftest import chdir, in_git_repo_context, package_dir
 
 
 @pytest.mark.parametrize(
@@ -92,8 +92,9 @@ def test_user_args(package_user_args, tmp_path, monkeypatch):
         'install-args': ('cli-install',),
     }
 
-    mesonpy.build_sdist(tmp_path, config_settings)
-    mesonpy.build_wheel(tmp_path, config_settings)
+    with in_git_repo_context():
+        mesonpy.build_sdist(tmp_path, config_settings)
+        mesonpy.build_wheel(tmp_path, config_settings)
 
     # check that the right commands are executed, namely that 'meson
     # compile' is used on Windows rather than a 'ninja' direct

{meson_python-0.13.0 → meson_python-0.13.1}/tests/test_wheel.py

@@ -240,3 +240,12 @@ def test_purelib_platlib_split(package_purelib_platlib_split, tmp_path):
     with pytest.raises(mesonpy.BuildError, match='The purelib-platlib-split package is split'):
         with mesonpy.Project.with_temp_working_dir() as project:
             project.wheel(tmp_path)
+
+
+@pytest.mark.skipif(platform.system() != 'Darwin', reason='macOS specific test')
+@pytest.mark.parametrize(('arch'), ['x86_64', 'arm64'])
+def test_archflags_envvar(package_purelib_and_platlib, monkeypatch, tmp_path, arch):
+    monkeypatch.setenv('ARCHFLAGS', f'-arch {arch}')
+    filename = mesonpy.build_wheel(tmp_path)
+    name = wheel.wheelfile.WheelFile(tmp_path / filename).parsed_filename
+    assert name.group('plat').endswith(arch)