pkgconf 2.3.0.post0__tar.gz → 2.3.0.post1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pkgconf
-Version: 2.3.0.post0
+Version: 2.3.0.post1
 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.post1}/pyproject.toml

@@ -11,7 +11,7 @@ requires = ['meson-python', 'wheel']
 
 [project]
 name = 'pkgconf'
-version = '2.3.0-0'
+version = '2.3.0-1'
 description = '`pkgconf` is a program which helps with discovering library dependencies and configuring compiler and linker flags.'
 readme = 'README.md'
 license = {file = 'LICENSE'}

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

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

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

@@ -42,6 +42,12 @@ def main() -> None:
     sys.exit(process.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():
     # Since project.script entrypoints use an hardcoded interpreter path from
     # the environment they were installed in, when stacking environments (eg.
@@ -54,7 +60,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.post1}/tests/test_entrypoints.py

@@ -35,6 +35,21 @@ def test_fallback(mocker, monkeypatch):
     sys.exit.assert_called_with(0)
 
 
+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'])