pkgconf 2.2.0.post0__tar.gz → 2.3.0.post0__tar.gz

{pkgconf-2.2.0.post0 → pkgconf-2.3.0.post0}/.github/workflows/test.yml

@@ -23,11 +23,11 @@ jobs:
           - windows
           - macos
         python:
-          - '3.8'
           - '3.9'
           - '3.10'
           - '3.11'
           - '3.12'
+          - '3.13'
       fail-fast: false
     steps:
       - uses: actions/checkout@v4

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

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -30,11 +30,11 @@ repos:
         files: ^.pre-commit-config.yaml
       - id: trailing-whitespace
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.18
+    rev: v0.23
     hooks:
       - id: validate-pyproject
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.9
+    rev: v0.8.6
     hooks:
       - id: ruff
         args: [--fix, --show-fixes]
@@ -56,7 +56,7 @@ repos:
       - id: rst-inline-touching-normal
       - id: text-unicode-replacement-char
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.16.0
+    rev: v3.19.1
     hooks:
     - id: pyupgrade
       args: [--py38-plus]

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

@@ -1,28 +1,28 @@
 Metadata-Version: 2.1
 Name: pkgconf
-Version: 2.2.0.post0
+Version: 2.3.0.post0
 Summary: `pkgconf` is a program which helps with discovering library dependencies and configuring compiler and linker flags.
-Home-page: https://pkgconf-pypi.readthedocs.io/en/latest/
 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
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy of
-        this software and associated documentation files (the “Software”), to deal in
-        the Software without restriction, including without limitation the rights to
-        use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-        of the Software, and to permit persons to whom the Software is furnished to do
-        so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
+         
+         Permission is hereby granted, free of charge, to any person obtaining a copy of
+         this software and associated documentation files (the “Software”), to deal in
+         the Software without restriction, including without limitation the rights to
+         use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+         of the Software, and to permit persons to whom the Software is furnished to do
+         so, subject to the following conditions:
+         
+         The above copyright notice and this permission notice shall be included in all
+         copies or substantial portions of the Software.
+         
+         THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+         IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+         FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+         AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+         SOFTWARE.
+         
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -33,12 +33,13 @@ Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
-Project-URL: Homepage, https://pkgconf-pypi.readthedocs.io/en/latest/
-Project-URL: Issues, https://github.com/pypackaging-native/pkgconf-pypi/issues
-Project-URL: Source, https://github.com/pypackaging-native/pkgconf-pypi
-Requires-Python: >=3.8
+Project-URL: homepage, https://pkgconf-pypi.readthedocs.io/en/latest/
+Project-URL: issues, https://github.com/pypackaging-native/pkgconf-pypi/issues
+Project-URL: source, https://github.com/pypackaging-native/pkgconf-pypi
+Requires-Python: >=3.9
 Requires-Dist: colorama; os_name == "nt"
 Requires-Dist: importlib_metadata; python_version < "3.10"
+Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov>=5; extra == "test"
 Requires-Dist: pytest-mock>=2; extra == "test"
@@ -46,11 +47,10 @@ Requires-Dist: pytest-order>=1; extra == "test"
 Requires-Dist: pytest-github-actions-annotate-failures; extra == "test"
 Requires-Dist: meson-python; extra == "test"
 Requires-Dist: environment-helpers>=0.1.3; extra == "test"
+Provides-Extra: docs
 Requires-Dist: sphinx~=7.0; extra == "docs"
 Requires-Dist: furo; extra == "docs"
 Requires-Dist: sphinx-design; extra == "docs"
-Provides-Extra: test
-Provides-Extra: docs
 Description-Content-Type: text/markdown
 
 # pkgconf-pypi

{pkgconf-2.2.0.post0 → pkgconf-2.3.0.post0}/docs/index.rst

@@ -51,6 +51,17 @@ should create an entry that points to the Python module which contains your
         :emphasize-lines: 1
         :caption: example.pc
 
+Package search path
+===================
+
+When you run the ``pkgconf`` executable embedded in this package, the ``PKG_CONFIG_PATH``
+environment variable will be set so that ``pkgconf`` can find the .pc files registered
+by the ``pkg-config`` entrypoint_. If the ``PKG_CONFIG_PATH`` environment variable is
+already set, it will be appended to.
+
+If the embedded pkgconf cannot find a package, by default it will fallback to the system
+``pkgconf``/``pkg-config``, which may find packages present on the system. To disable
+this behavior, set the ``PKGCONF_PYPI_EMBEDDED_ONLY=1`` environment variable.
 
 API
 ===

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

@@ -16,6 +16,7 @@ py.install_sources(
   [
     'src/pkgconf/__init__.py',
     'src/pkgconf/__main__.py',
+    'src/pkgconf/_import.py',
     'src/pkgconf/diagnose.py',
   ],
   subdir: 'pkgconf',

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

@@ -11,7 +11,7 @@ requires = ['meson-python', 'wheel']
 
 [project]
 name = 'pkgconf'
-version = '2.2.0-0'
+version = '2.3.0-0'
 description = '`pkgconf` is a program which helps with discovering library dependencies and configuring compiler and linker flags.'
 readme = 'README.md'
 license = {file = 'LICENSE'}
@@ -31,7 +31,7 @@ classifiers = [
   'Operating System :: Unix',
   'Operating System :: MacOS'
 ]
-requires-python = '>= 3.8'
+requires-python = '>= 3.9'
 dependencies = [
   'colorama; os_name == "nt"',
   'importlib_metadata; python_version < "3.10"',
@@ -79,7 +79,7 @@ config-settings = 'setup-args=--vsenv build-dir=build'
 
 [tool.mypy]
 files = 'src'
-python_version = '3.8'
+python_version = '3.9'
 show_error_codes = true
 strict = true
 
@@ -109,6 +109,9 @@ extend-select = [
 lines-after-imports = 2
 lines-between-types = 1
 
+[tool.ruff.lint.per-file-ignores]
+'tests/packages/error-on-import/**' = ['TRY002', 'TRY003', 'EM101']
+
 [tool.coverage.run]
 source = [
   'pkgconf',

{pkgconf-2.2.0.post0 → pkgconf-2.3.0.post0}/src/buildhack.py

@@ -29,13 +29,10 @@ def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
     assert new_name != wheel_path.name
     new_wheel_path = workdir / new_name
 
-    with wheel.wheelfile.WheelFile(
-        wheel_path,
-        'r',
-    ) as original_wheel, wheel.wheelfile.WheelFile(
-        new_wheel_path,
-        'w',
-    ) as new_wheel:
+    with (
+        wheel.wheelfile.WheelFile(wheel_path, 'r') as original_wheel,
+        wheel.wheelfile.WheelFile(new_wheel_path, 'w') as new_wheel,
+    ):
         for item in original_wheel.infolist():
             if item.filename.endswith('.dist-info/WHEEL'):
                 new_wheel.writestr(

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

@@ -1,4 +1,3 @@
-import importlib
 import itertools
 import logging
 import operator
@@ -10,13 +9,10 @@ import sys
 import sysconfig
 import warnings
 
+from collections.abc import Sequence
 from typing import Any, Optional
 
-
-if sys.version_info >= (3, 9):
-    from collections.abc import Sequence
-else:
-    from typing import Sequence
+import pkgconf._import
 
 
 if sys.version_info >= (3, 10):
@@ -32,6 +28,9 @@ _LOGGER = logging.getLogger(__name__)
 
 
 def _get_system_executable() -> Optional[pathlib.Path]:
+    if os.environ.get('PKGCONF_PYPI_EMBEDDED_ONLY'):
+        return None
+
     scripts = sysconfig.get_path('scripts')
     path_list = os.environ.get('PATH', os.defpath).split(os.pathsep)
     if scripts in path_list:
@@ -68,8 +67,15 @@ def get_executable() -> pathlib.Path:
 
 
 def _get_module_paths(name: str) -> Sequence[str]:
-    module = importlib.import_module(name)
-    return list(module.__path__)
+    try:
+        module = pkgconf._import.import_module_no_exec(name)
+        if not hasattr(module, '__path__'):
+            warnings.warn(f"{module} isn't a package, it won't be added to PKG_CONFIG_PATH", stacklevel=2)
+            return []
+        return list(module.__path__)
+    except Exception:
+        _LOGGER.exception(f'Failed to find paths for module {name!r}')
+        return []
 
 
 def get_pkg_config_path() -> Sequence[str]:
@@ -87,7 +93,7 @@ def get_pkg_config_path() -> Sequence[str]:
     return itertools.chain.from_iterable([_get_module_paths(entry.value) for entry in sorted_entrypoints])
 
 
-def run_pkgconf(*args: str, **subprocess_kwargs: Any) -> subprocess.Popen:
+def run_pkgconf(*args: str, **subprocess_kwargs: Any) -> subprocess.CompletedProcess:
     """Run the pkgconf executable.
 
     :param args: Arguments to pass to the pkgconf call.

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

@@ -2,9 +2,10 @@ import logging
 import os
 import subprocess
 import sys
+import sysconfig
 import warnings
 
-from typing import Optional, TextIO, Type, Union
+from typing import Optional, TextIO, Union
 
 import pkgconf
 
@@ -14,8 +15,15 @@ _LOGGER = logging.getLogger(__name__)
 
 def main() -> None:
     args = sys.argv[1:]
+
+    # If we find that we are calling ourselves, exit immediately
+    if os.environ.get('PKGCONF_PYPI_RECURSIVE') == __file__:
+        _LOGGER.info('Giving up, pkgconf recursion loop detected')
+        sys.exit(1)
+
+    os.environ['PKGCONF_PYPI_RECURSIVE'] = __file__
     try:
-        pkgconf.run_pkgconf(*args, check=True)
+        process = pkgconf.run_pkgconf(*args, check=True)
     except subprocess.SubprocessError:
         # If our pkgconf lookup fails, fallback to the system pkgconf/pkg-config.
         # For simplicity, the previous call will output to stdout/stderr
@@ -29,7 +37,30 @@ def main() -> None:
             cmd = [os.fspath(system_executable), *args]
             _LOGGER.info(f'Running the system {system_executable.name}')
             _LOGGER.info('$ ' + ' '.join(cmd))
-            subprocess.run(cmd)
+            process = subprocess.run(cmd)
+
+    sys.exit(process.returncode)
+
+
+def _entrypoint():
+    # Since project.script entrypoints use an hardcoded interpreter path from
+    # the environment they were installed in, when stacking environments (eg.
+    # using venv's --system-site-packages option), the entrypoint will run in
+    # the base environment and, as such, it will not have access to the
+    # entrypoints from the "child" environment. Because of this, when a virtual
+    # environment is enabled, instead of running main() from this process, we
+    # will run 'python -m pkgconf', so that we have access to the full
+    # environment.
+    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)
+        python_path = os.path.join(scripts, 'python')
+        process = subprocess.run([python_path, '-m', 'pkgconf', *sys.argv[1:]])
+        sys.exit(process.returncode)
+    else:
+        _setup_cli()
+        main()
 
 
 def _use_colors() -> bool:
@@ -64,7 +95,7 @@ def _setup_cli():
 
     def _showwarning(
         message: Union[Warning, str],
-        category: Type[Warning],
+        category: type[Warning],
         filename: str,
         lineno: int,
         file: Optional[TextIO] = None,
@@ -75,10 +106,6 @@ def _setup_cli():
     warnings.showwarning = _showwarning
 
 
-def _entrypoint():
+if __name__ == '__main__':
     _setup_cli()
     main()
-
-
-if __name__ == '__main__':
-    _entrypoint()

pkgconf-2.3.0.post0/src/pkgconf/_import.py

@@ -0,0 +1,73 @@
+import contextlib
+import importlib.util
+import sys
+import types
+
+from typing import Any
+
+
+class LazyModule(types.ModuleType):
+    def __getattribute__(self, name: str) -> Any:
+        with contextlib.suppress(AttributeError):
+            return object.__getattribute__(self, name)
+        # Undo patching — restore the original __getattribute__, __class__, and loader_state
+        __spec__ = object.__getattribute__(self, '__spec__')
+        object.__setattr__(self, '__class__', __spec__.loader_state['__class__'])
+        object.__setattr__(self, '__getattribute__', __spec__.loader_state['__getattribute__'])
+        __spec__.loader_state = __spec__.loader_state['loader_state']
+        # Run the original __getattribute__
+        return self.__getattribute__(name)
+
+
+class LazyLoader(importlib.util.LazyLoader):
+    """Custom type extending importlib.util.LazyLoader's capabilities.
+
+    It uses the importlib.util.LazyLoader implementation, but provides a custom
+    __getattribute__ that delays the execution when accessing types.ModuleType
+    attributes (like __spec__, __path__, __file__, etc.).
+
+    The original implementation triggers the module execution when accessing
+    *any* attribute, even ones initialized in types.ModuleType. While it is
+    highly discouraged to change any of these attributes during module
+    execution, it is technically permitted, so the default LazyLoader
+    implementation makes the decision to trigger the module execution on any
+    attribute access. We don't care so much about that, so we make choice to
+    allow attribute access to to existing pre-initilized attributes without
+    executing the module.
+    """
+
+    def exec_module(self, module: types.ModuleType) -> None:
+        # Run
+        super().exec_module(module)
+        # Get module.__spec__ using object.__getattribute__ to avoid triggering
+        # the original __getattribute__, which will always execute the module.
+        __spec__ = object.__getattribute__(module, '__spec__')
+        # Save the original __getattribute__ and __class__
+        __spec__.loader_state = {
+            '__class__': object.__getattribute__(module, '__class__'),
+            '__getattribute__': object.__getattribute__(module, '__getattribute__'),
+            'loader_state': __spec__.loader_state,
+        }
+        # Replace __class__ so that attribute lookups use our __getattribute__
+        module.__class__ = LazyModule
+
+
+def import_module_no_exec(name: str) -> types.ModuleType:
+    """Return a module object with all the module attributes set, but without executing it."""
+    if name in sys.modules:
+        return sys.modules[name]
+    # Import parent without execution
+    if parent := name.rpartition('.')[0]:
+        import_module_no_exec(parent)
+    # Find spec
+    spec = importlib.util.find_spec(name)
+    if not spec:
+        msg = f'No module named {name!r}'
+        raise ModuleNotFoundError(msg)
+    # Create module object without executing
+    module = importlib.util.module_from_spec(spec)
+    # Make the module load lazily (only executes when an attribute is accessed)
+    LazyLoader(spec.loader).create_module(module)
+    # Save to sys.modules
+    sys.modules[name] = module
+    return module

{pkgconf-2.2.0.post0 → pkgconf-2.3.0.post0}/subprojects/pkgconf/Makefile.am

@@ -9,6 +9,7 @@ personality_dir        = @PERSONALITY_PATH@
 pkgconfigdir           = $(libdir)/pkgconfig
 nodist_pkgconfig_DATA  = libpkgconf.pc
 
+ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = -DPERSONALITY_PATH=\"$(personality_dir)\" -DPKG_DEFAULT_PATH=\"$(pkg_default_dir)\" -DSYSTEM_INCLUDEDIR=\"$(system_includedir)\" -DSYSTEM_LIBDIR=\"$(system_libdir)\"
 
 bin_PROGRAMS = pkgconf bomtool
@@ -110,6 +111,7 @@ EXTRA_DIST =	pkg.m4 \
 		tests/lib1/sysroot-dir-3.pc \
 		tests/lib1/sysroot-dir-4.pc \
 		tests/lib1/sysroot-dir-5.pc \
+		tests/lib1/child-prefix/pkgconfig/child-prefix-1.pc \
 		$(test_scripts) \
 		doc/conf.py \
 		doc/extract.py \

{pkgconf-2.2.0.post0 → pkgconf-2.3.0.post0}/subprojects/pkgconf/Makefile.lite

@@ -39,7 +39,7 @@ all: pkgconf-lite
 libpkgconf/config.h:
 	@echo '#define PACKAGE_NAME "pkgconf-lite"' >> $@
 	@echo '#define PACKAGE_BUGREPORT "https://git.dereferenced.org/pkgconf/pkgconf/issues"' >> $@
-	@echo '#define PACKAGE_VERSION "2.2.0"' >> $@
+	@echo '#define PACKAGE_VERSION "2.3.0"' >> $@
 	@echo '#define PACKAGE PACKAGE_NAME " " PACKAGE_VERSION' >> $@
 	@echo '#define HAVE_STRLCPY' >> $@
 	@echo '#define HAVE_STRLCAT' >> $@

{pkgconf-2.2.0.post0 → pkgconf-2.3.0.post0}/subprojects/pkgconf/NEWS

@@ -1,6 +1,41 @@
 Changes from previous version of pkgconf
 ========================================
 
+Changes from 2.2.0 to 2.3.0:
+----------------------------
+
+* Fix compile with Meson on Solaris by defining __EXTENSIONS__.
+
+* Add support for the PKG_CONFIG_RELOCATE_PATHS environmental variable.
+  When set, the program will act as if --define-prefix is always enabled.
+
+* Color solution nodes that were part of the original query, and use
+  that coloring to skip over dependencies when generating DocumentNames
+  in bomtool.
+
+* Enhance --env option to support variables with both --variable=varname
+  and --print-variables.
+
+* Add --exists-cflags option which creates synthetic preprocessor
+  definition flags for every queried dependency when found.
+
+* Document that Requires.private is always used for header paths.
+  Patch by Petr Písař.
+
+* Fix minor documentation typos.
+  Patch by Pierce.
+
+* Ensure string comparisons using <ctype.h> functions are done with
+  unsigned bytes to avoid undefined behavior.
+  Patch by Taylor R Campbell.
+
+* Fix parsing edge-case bugs with dependency versions.
+  Patch by Kai Pastor.
+
+* Change PKG_PROG_PKG_CONFIG autoconf macro to add a customizable
+  failure handler if pkg-config is not found.
+  Patch by Ismael Luceno.
+
 Changes from 2.1.1 to 2.2.0:
 ----------------------------
 

{pkgconf-2.2.0.post0 → pkgconf-2.3.0.post0}/subprojects/pkgconf/README.md

@@ -116,7 +116,7 @@ flags like so:
 
 
 pkgconf is compiled using [Meson](https://mesonbuild.com) on Windows. In theory, you could also use
-Meson to build on UNIX, but this is not recommended at this time as it pkgconf is typically built
+Meson to build on UNIX, but this is not recommended at this time as pkgconf is typically built
 much earlier than Meson.
 
     $ meson setup build -Dtests=disabled

{pkgconf-2.2.0.post0 → pkgconf-2.3.0.post0}/subprojects/pkgconf/cli/bomtool/main.c

@@ -65,6 +65,9 @@ sbom_name(pkgconf_pkg_t *world)
 		pkgconf_dependency_t *dep = node->data;
 		pkgconf_pkg_t *match = dep->match;
 
+		if ((dep->flags & PKGCONF_PKG_DEPF_QUERY) != PKGCONF_PKG_DEPF_QUERY)
+			continue;
+
 		if (!dep->match)
 			continue;