pkgconf 2.3.0.post0__tar.gz → 2.3.0.post2__tar.gz

{pkgconf-2.3.0.post0 → pkgconf-2.3.0.post2}/.pre-commit-config.yaml

@@ -34,7 +34,7 @@ repos:
     hooks:
       - id: validate-pyproject
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.6
+    rev: v0.9.2
     hooks:
       - id: ruff
         args: [--fix, --show-fixes]

{pkgconf-2.3.0.post0 → pkgconf-2.3.0.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pkgconf
-Version: 2.3.0.post0
+Version: 2.3.0.post2
 Summary: `pkgconf` is a program which helps with discovering library dependencies and configuring compiler and linker flags.
 Author-Email: Ralf Gommers <ralf.gommers@gmail.com>, =?utf-8?q?Filipe_La=C3=ADns?= <lains@riseup.net>
 License: Copyright (c) 2024 pypackaging-native contributors

{pkgconf-2.3.0.post0 → pkgconf-2.3.0.post2}/meson.build

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 project('pkgconf-pypi',
-  version : '2.2.0-0',
+  version : '2.3.0-2',
   license : 'MIT AND ISC',
   license_files : ['LICENSE'],
   meson_version : '>=1.3.2',

{pkgconf-2.3.0.post0 → pkgconf-2.3.0.post2}/pyproject.toml

@@ -11,7 +11,7 @@ requires = ['meson-python', 'wheel']
 
 [project]
 name = 'pkgconf'
-version = '2.3.0-0'
+version = '2.3.0-2'
 description = '`pkgconf` is a program which helps with discovering library dependencies and configuring compiler and linker flags.'
 readme = 'README.md'
 license = {file = 'LICENSE'}
@@ -64,7 +64,7 @@ source = 'https://github.com/pypackaging-native/pkgconf-pypi'
 
 [tool.meson-python.args]
 install = ['--tags=python-runtime']
-setup = ['--prefix=/build']
+# setup = ['--prefix=/build']
 
 [tool.cibuildwheel]
 # Build is Python-independent, so we select a single Python version (doesn't

{pkgconf-2.3.0.post0 → pkgconf-2.3.0.post2}/src/pkgconf/__init__.py

@@ -21,7 +21,7 @@ else:
     import importlib_metadata
 
 
-__version__ = '2.2.0-0'
+__version__ = '2.3.0-2'
 
 
 _LOGGER = logging.getLogger(__name__)

{pkgconf-2.3.0.post0 → pkgconf-2.3.0.post2}/src/pkgconf/__main__.py

@@ -22,9 +22,10 @@ def main() -> None:
         sys.exit(1)
 
     os.environ['PKGCONF_PYPI_RECURSIVE'] = __file__
+    returncode = 1
     try:
-        process = pkgconf.run_pkgconf(*args, check=True)
-    except subprocess.SubprocessError:
+        returncode = pkgconf.run_pkgconf(*args, check=True).returncode
+    except subprocess.SubprocessError as e:
         # If our pkgconf lookup fails, fallback to the system pkgconf/pkg-config.
         # For simplicity, the previous call will output to stdout/stderr
         # regardless of its success, since capturing stdout/stderr in order to
@@ -37,9 +38,17 @@ def main() -> None:
             cmd = [os.fspath(system_executable), *args]
             _LOGGER.info(f'Running the system {system_executable.name}')
             _LOGGER.info('$ ' + ' '.join(cmd))
-            process = subprocess.run(cmd)
+            returncode = subprocess.run(cmd).returncode
+        elif isinstance(e, subprocess.CalledProcessError):
+            returncode = e.returncode
 
-    sys.exit(process.returncode)
+    sys.exit(returncode)
+
+
+def _venv_paths(config_vars: dict[str, str]) -> str:
+    if 'venv' in sysconfig.get_scheme_names():
+        return sysconfig.get_paths('venv', vars=config_vars)
+    return sysconfig.get_paths(vars=config_vars)
 
 
 def _entrypoint():
@@ -54,7 +63,7 @@ def _entrypoint():
     if 'VIRTUAL_ENV' in os.environ:
         venv_vars = sysconfig.get_config_vars().copy()
         venv_vars['base'] = venv_vars['platbase'] = os.environ['VIRTUAL_ENV']
-        scripts = sysconfig.get_path('scripts', scheme='venv', vars=venv_vars)
+        scripts = _venv_paths(venv_vars)['scripts']
         python_path = os.path.join(scripts, 'python')
         process = subprocess.run([python_path, '-m', 'pkgconf', *sys.argv[1:]])
         sys.exit(process.returncode)

{pkgconf-2.3.0.post0 → pkgconf-2.3.0.post2}/tests/test_entrypoints.py

@@ -35,6 +35,37 @@ def test_fallback(mocker, monkeypatch):
     sys.exit.assert_called_with(0)
 
 
+def test_no_fallback(mocker, monkeypatch):
+    """Test that we don't fail if there's no system pkgconf and ours fails."""
+    mocker.patch('pkgconf.run_pkgconf', side_effect=subprocess.CalledProcessError(1, '(cmd)'))
+    mocker.patch('subprocess.run', return_value=subprocess.CompletedProcess(['(cmd)'], 0))
+    mocker.patch('sys.exit')
+
+    mocker.patch('shutil.which', return_value=None)
+
+    args = ['--libs', 'py-test-inexistent']
+    monkeypatch.setattr(sys, 'argv', ['(argv0)', *args])
+
+    pkgconf.__main__.main()
+
+    sys.exit.assert_called_with(1)
+
+
+def test_venv_redirect(mocker, monkeypatch):
+    mocker.patch('subprocess.run', return_value=subprocess.CompletedProcess(['(cmd)'], 0))
+    mocker.patch('sys.exit')
+
+    monkeypatch.setenv('VIRTUAL_ENV', '(venv)')
+
+    args = ['--libs', 'py-test-inexistent']
+    monkeypatch.setattr(sys, 'argv', ['(argv0)', *args])
+
+    pkgconf.__main__._entrypoint()
+
+    assert subprocess.run.call_args.args[0][1:] == ['-m', 'pkgconf', *args]
+    sys.exit.assert_called_with(0)
+
+
 def test_venv_system_site_packages(container):
     # Install pkgconf in the global site-packages
     status, out = container.exec_run(['pip', 'install', '/project'])