cmeel 0.41.0__tar.gz → 0.59.0__tar.gz

cmeel-0.59.0/.gitignore

@@ -0,0 +1,2 @@
+.*.un~
+*.orig

{cmeel-0.41.0 → cmeel-0.59.0}/PKG-INFO

@@ -1,45 +1,39 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cmeel
-Version: 0.41.0
+Version: 0.59.0
 Summary: Create Wheel from CMake projects
-Home-page: https://github.com/cmake-wheel/cmeel
-License: BSD-2-Clause
-Author: Guilhem Saurel
-Author-email: guilhem.saurel@laas.fr
-Requires-Python: >=3.7,<4.0
-Classifier: License :: OSI Approved :: BSD License
+Project-URL: Changelog, https://github.com/cmake-wheel/cmeel/blob/main/CHANGELOG.md
+Project-URL: Documentation, https://cmeel.readthedocs.io/
+Project-URL: Homepage, https://github.com/cmake-wheel/cmeel
+Author-email: Guilhem Saurel <guilhem.saurel@laas.fr>
+License-Expression: BSD-2-Clause
+License-File: LICENSE
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: C++
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: System :: Archiving :: Packaging
 Classifier: Topic :: System :: Software Distribution
+Requires-Python: >=3.9
+Requires-Dist: tomli>=2.1.0; python_full_version < '3.11'
 Provides-Extra: build
-Requires-Dist: cmake (>=3.22.3,<4.0.0) ; extra == "build"
-Requires-Dist: importlib-metadata (>=6.0.0,<7.0.0) ; python_version < "3.8"
-Requires-Dist: packaging (>=23.0,<24.0) ; extra == "build"
-Requires-Dist: tomli (>=2.0.1,<3.0.0)
-Requires-Dist: wheel (>=0.38.4,<0.41.0) ; extra == "build"
-Project-URL: Documentation, https://cmeel.readthedocs.io/
-Project-URL: changelog, https://github.com/cmake-wheel/cmeel/blob/main/CHANGELOG.md
+Requires-Dist: cmake>=3.31.2; extra == 'build'
+Requires-Dist: git-archive-all; extra == 'build'
+Requires-Dist: packaging>=24.2; extra == 'build'
+Requires-Dist: wheel>=0.45.1; extra == 'build'
 Description-Content-Type: text/markdown
 
-# CMake Wheel
+# CMake Wheel: cmeel
 
 [![PyPI version](https://badge.fury.io/py/cmeel.svg)](https://pypi.org/project/cmeel)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/cmake-wheel/cmeel/main.svg)](https://results.pre-commit.ci/latest/github/cmake-wheel/cmeel/main)
 [![Documentation Status](https://readthedocs.org/projects/cmeel/badge/?version=latest)](https://cmeel.readthedocs.io/en/latest/?badge=latest)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v1.json)](https://github.com/charliermarsh/ruff)
+[![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
 
-Wheel build backend using CMake, to package anything with pip and distribute on PyPI.
+Wheel build backend using CMake, to package any CMake project with pip and distribute on PyPI.
 
 Following those relevant PEPs:
 - [PEP 427](https://peps.python.org/pep-0427/), The Wheel Binary Package Format 1.0
@@ -47,7 +41,7 @@ Following those relevant PEPs:
 - [PEP 518](https://peps.python.org/pep-0518/), Specifying Minimum Build System Requirements for Python Projects
 - [PEP 600](https://peps.python.org/pep-0600/), Future ‘manylinux’ Platform Tags for Portable Linux Built Distributions
 - [PEP 621](https://peps.python.org/pep-0621/), Storing project metadata in pyproject.toml
-- [PEP 639](https://peps.python.org/pep-0639/), Improving License Clarity with Better Package Metadata, **DRAFT**
+- [PEP 639](https://peps.python.org/pep-0639/), Improving License Clarity with Better Package Metadata
 - [PEP 660](https://peps.python.org/pep-0660/), Editable installs for pyproject.toml based builds (wheel based)
 
 ## Chat
@@ -56,37 +50,46 @@ https://matrix.to/#/#cmake-wheel:matrix.org
 
 ## Basic idea
 
-Glue between PEP 517 `build_wheel` function and modern CMake standard project configuration / build / test / install
-
-This Install in `${PYTHON_SITELIB}/cmeel.prefix/`:
+Glue between PEP 517 & 660 entry points and modern CMake standard project configuration / build / test / install, and
+install in `${PYTHON_SITELIB}/cmeel.prefix/`:
 - As there is a dot, it is not a valid python module name, so no risk of importing anything there by mistake
 - Play well with others, as everything is confined to `${PYTHON_SITELIB}/cmeel.prefix`
 - `${PYTHON_SITELIB}/cmeel.pth` automatically load `${PYTHON_SITELIB}/cmeel.prefix/${PYTHON_SITELIB}`, so python
   packages work out of the box
 - Existing `${PYTHON_SITELIB}/cmeel.prefix` are automatically added to `$CMAKE_PREFIX_PATH`, so we can build CMake
-  packages whose dependencies are provided by other CMake packages installed with cmeel
-- Stuff in `${PYTHON_SITELIB}/cmeel.prefix/bin` is exposed via `cmeel.run:cmeel_run`
+  packages whose dependencies are provided by other packages installed with cmeel
+- Stuff in `${PYTHON_SITELIB}/cmeel.prefix/bin` is exposed via `cmeel.run:cmeel_run`, or copied if start with a shebang
 
 ## Basic pyproject.toml example
 
 extract from  https://github.com/cmake-wheel/cmeel-example/blob/main/pyproject.toml:
 
 ```toml
+[build-system]
+build-backend = "cmeel"
+requires = ["cmeel[build]"]
+
 [project]
-name = "cmeel-example"
-version = "0.4.12"
+authors = [{email = "guilhem.saurel@laas.fr", name = "Guilhem Saurel"}]
 description = "This is an example project, to show how to use cmeel"
-requires-python = ">= 3.7"
 license = "BSD-2-Clause"
-authors = [{name = "Guilhem Saurel", email = "guilhem.saurel@laas.fr"}]
+name = "cmeel-example"
+requires-python = ">= 3.8"
+version = "0.7.0"
 
 [project.urls]
+changelog = "https://github.com/cmake-wheel/cmeel-example/blob/main/CHANGELOG.md"
 homepage = "https://github.com/cmake-wheel/cmeel-example"
 repository = "https://github.com/cmake-wheel/cmeel-example.git"
-changelog = "https://github.com/cmake-wheel/cmeel-example/blob/main/CHANGELOG.md"
-
-[build-system]
-requires = ["cmeel[build]"]
-build-backend = "cmeel.build"
 ```
 
+Complete specification is available at:
+https://packaging.python.org/en/latest/specifications/declaring-project-metadata
+
+## Install
+
+If you want to use the helpers provided by cmeel, to *eg*. test building a project in a manylinux container with
+`cmeel docker`, the best way to install cmeel is to use pipx: `pipx install cmeel`
+
+Otherwise, if you just want to use the build backend, there is no need to install anything: your frontent (*eg.* `pip`)
+should do this for you

{cmeel-0.41.0 → cmeel-0.59.0}/README.md

@@ -1,12 +1,13 @@
-# CMake Wheel
+# CMake Wheel: cmeel
 
 [![PyPI version](https://badge.fury.io/py/cmeel.svg)](https://pypi.org/project/cmeel)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/cmake-wheel/cmeel/main.svg)](https://results.pre-commit.ci/latest/github/cmake-wheel/cmeel/main)
 [![Documentation Status](https://readthedocs.org/projects/cmeel/badge/?version=latest)](https://cmeel.readthedocs.io/en/latest/?badge=latest)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v1.json)](https://github.com/charliermarsh/ruff)
+[![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
 
-Wheel build backend using CMake, to package anything with pip and distribute on PyPI.
+Wheel build backend using CMake, to package any CMake project with pip and distribute on PyPI.
 
 Following those relevant PEPs:
 - [PEP 427](https://peps.python.org/pep-0427/), The Wheel Binary Package Format 1.0
@@ -14,7 +15,7 @@ Following those relevant PEPs:
 - [PEP 518](https://peps.python.org/pep-0518/), Specifying Minimum Build System Requirements for Python Projects
 - [PEP 600](https://peps.python.org/pep-0600/), Future ‘manylinux’ Platform Tags for Portable Linux Built Distributions
 - [PEP 621](https://peps.python.org/pep-0621/), Storing project metadata in pyproject.toml
-- [PEP 639](https://peps.python.org/pep-0639/), Improving License Clarity with Better Package Metadata, **DRAFT**
+- [PEP 639](https://peps.python.org/pep-0639/), Improving License Clarity with Better Package Metadata
 - [PEP 660](https://peps.python.org/pep-0660/), Editable installs for pyproject.toml based builds (wheel based)
 
 ## Chat
@@ -23,36 +24,46 @@ https://matrix.to/#/#cmake-wheel:matrix.org
 
 ## Basic idea
 
-Glue between PEP 517 `build_wheel` function and modern CMake standard project configuration / build / test / install
-
-This Install in `${PYTHON_SITELIB}/cmeel.prefix/`:
+Glue between PEP 517 & 660 entry points and modern CMake standard project configuration / build / test / install, and
+install in `${PYTHON_SITELIB}/cmeel.prefix/`:
 - As there is a dot, it is not a valid python module name, so no risk of importing anything there by mistake
 - Play well with others, as everything is confined to `${PYTHON_SITELIB}/cmeel.prefix`
 - `${PYTHON_SITELIB}/cmeel.pth` automatically load `${PYTHON_SITELIB}/cmeel.prefix/${PYTHON_SITELIB}`, so python
   packages work out of the box
 - Existing `${PYTHON_SITELIB}/cmeel.prefix` are automatically added to `$CMAKE_PREFIX_PATH`, so we can build CMake
-  packages whose dependencies are provided by other CMake packages installed with cmeel
-- Stuff in `${PYTHON_SITELIB}/cmeel.prefix/bin` is exposed via `cmeel.run:cmeel_run`
+  packages whose dependencies are provided by other packages installed with cmeel
+- Stuff in `${PYTHON_SITELIB}/cmeel.prefix/bin` is exposed via `cmeel.run:cmeel_run`, or copied if start with a shebang
 
 ## Basic pyproject.toml example
 
 extract from  https://github.com/cmake-wheel/cmeel-example/blob/main/pyproject.toml:
 
 ```toml
+[build-system]
+build-backend = "cmeel"
+requires = ["cmeel[build]"]
+
 [project]
-name = "cmeel-example"
-version = "0.4.12"
+authors = [{email = "guilhem.saurel@laas.fr", name = "Guilhem Saurel"}]
 description = "This is an example project, to show how to use cmeel"
-requires-python = ">= 3.7"
 license = "BSD-2-Clause"
-authors = [{name = "Guilhem Saurel", email = "guilhem.saurel@laas.fr"}]
+name = "cmeel-example"
+requires-python = ">= 3.8"
+version = "0.7.0"
 
 [project.urls]
+changelog = "https://github.com/cmake-wheel/cmeel-example/blob/main/CHANGELOG.md"
 homepage = "https://github.com/cmake-wheel/cmeel-example"
 repository = "https://github.com/cmake-wheel/cmeel-example.git"
-changelog = "https://github.com/cmake-wheel/cmeel-example/blob/main/CHANGELOG.md"
-
-[build-system]
-requires = ["cmeel[build]"]
-build-backend = "cmeel.build"
 ```
+
+Complete specification is available at:
+https://packaging.python.org/en/latest/specifications/declaring-project-metadata
+
+## Install
+
+If you want to use the helpers provided by cmeel, to *eg*. test building a project in a manylinux container with
+`cmeel docker`, the best way to install cmeel is to use pipx: `pipx install cmeel`
+
+Otherwise, if you just want to use the build backend, there is no need to install anything: your frontent (*eg.* `pip`)
+should do this for you

cmeel-0.59.0/cmeel/__init__.py

@@ -0,0 +1,6 @@
+"""Cmeel module."""
+
+# ruff: noqa: F401
+
+from .build import build_editable, build_sdist, build_wheel
+from .cmeel import __author__, __license__, __project_name__, __version__

{cmeel-0.41.0 → cmeel-0.59.0}/cmeel/__main__.py

@@ -6,8 +6,10 @@ import os
 import pathlib
 import sys
 
+from . import __version__
 from .docker import add_docker_arguments, docker_build
-from .helpers import add_paths_arguments, get_paths
+from .env import add_paths_arguments, get_paths
+from .release import add_release_arguments, release
 
 LOG = logging.getLogger("cmeel")
 
@@ -22,7 +24,7 @@ def parse_args() -> argparse.Namespace:
 
     parser = argparse.ArgumentParser(
         prog=f"{python} -m cmeel",
-        description="cmeel environment helpers",
+        description="cmeel helpers",
     )
     parser.add_argument(
         "-v",
@@ -39,6 +41,10 @@ def parse_args() -> argparse.Namespace:
 
     add_paths_arguments(subparsers)
     add_docker_arguments(subparsers)
+    add_release_arguments(subparsers)
+
+    ver = subparsers.add_parser("version", help="print current cmeel version.")
+    ver.set_defaults(cmd="version")
 
     args = parser.parse_args()
 
@@ -48,6 +54,8 @@ def parse_args() -> argparse.Namespace:
         level = 30 - 10 * args.verbose
     logging.basicConfig(level=level)
 
+    LOG.debug("parsed arguments: %s", args)
+
     if "cmd" in args:
         LOG.debug("running subcommand %s", args.cmd)
         return args
@@ -56,9 +64,18 @@ def parse_args() -> argparse.Namespace:
     sys.exit(0)
 
 
-if __name__ == "__main__":
+def main():
+    """Run helpers."""
     args = parse_args()
     if args.cmd == "docker":
         docker_build(**vars(args))
+    elif args.cmd == "release":
+        release(**vars(args))
+    elif args.cmd == "version":
+        print(f"This is cmeel version {__version__}")
     else:
         print(get_paths(**vars(args)))
+
+
+if __name__ == "__main__":
+    main()

cmeel-0.59.0/cmeel/backports.py

@@ -0,0 +1,48 @@
+# ruff: noqa
+
+try:
+    from argparse import BooleanOptionalAction  # type: ignore
+except ImportError:
+    # Python < 3.9
+    # https://github.com/python/cpython/blob/3.11/Lib/argparse.py#L885
+
+    from argparse import Action
+
+    class BooleanOptionalAction(Action):  # type: ignore
+        def __init__(
+            self,
+            option_strings,
+            dest,
+            default=None,
+            type=None,
+            choices=None,
+            required=False,
+            help=None,
+            metavar=None,
+        ):
+            _option_strings = []
+            for option_string in option_strings:
+                _option_strings.append(option_string)
+
+                if option_string.startswith("--"):
+                    option_string = "--no-" + option_string[2:]
+                    _option_strings.append(option_string)
+
+            super().__init__(
+                option_strings=_option_strings,
+                dest=dest,
+                nargs=0,
+                default=default,
+                type=type,
+                choices=choices,
+                required=required,
+                help=help,
+                metavar=metavar,
+            )
+
+        def __call__(self, parser, namespace, values, option_string=None):
+            if option_string in self.option_strings:
+                setattr(namespace, self.dest, not option_string.startswith("--no-"))
+
+        def format_usage(self):
+            return " | ".join(self.option_strings)

cmeel-0.59.0/cmeel/build.py

@@ -0,0 +1,31 @@
+"""PEP 517 & 660 entry points."""
+
+import logging
+import os
+
+from .impl import build_impl
+from .sdist import sdist_impl
+
+LOG = logging.getLogger("cmeel")
+
+
+def build_editable(
+    wheel_directory,
+    config_settings=None,
+    metadata_directory=None,
+) -> str:
+    """Build an editable wheel: main entry point for PEP 660."""
+    LOG.info("cmeel build editable")
+    os.environ["CMAKE_INSTALL_MODE"] = "ABS_SYMLINK"
+    return build_impl(wheel_directory, editable=True)
+
+
+def build_wheel(wheel_directory, config_settings=None, metadata_directory=None) -> str:
+    """Build a binary wheel: main entry point for PEP 517."""
+    LOG.info("cmeel build wheel")
+    return build_impl(wheel_directory, editable=False)
+
+
+def build_sdist(sdist_directory, config_settings=None) -> str:
+    """Generate a gzipped distribution tarball."""
+    return sdist_impl(sdist_directory)

cmeel-0.41.0/cmeel/__init__.py → cmeel-0.59.0/cmeel/cmeel.py

@@ -1,9 +1,6 @@
-"""Cmeel module."""
+"""Cmeel metadata."""
 
-try:
-    from importlib.metadata import metadata
-except ImportError:  # Python < 3.8
-    from importlib_metadata import metadata  # type: ignore
+from importlib.metadata import metadata
 
 __metadata__ = metadata("cmeel")
 __project_name__ = __metadata__["name"]

{cmeel-0.41.0 → cmeel-0.59.0}/cmeel/config.py

@@ -1,13 +1,21 @@
-"""Cmeel config."""
-import os
+"""Cmeel configuration.
+
+Parse various configuration files and environment variables.
+"""
+
 import sys
+from os import environ, pathsep
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Optional, Union
 
-import tomli
+try:
+    import tomllib  # type: ignore
+except ModuleNotFoundError:
+    import tomli as tomllib  # type: ignore
 
 from .consts import CMEEL_PREFIX, SITELIB
+from .env import get_paths
 
 
 class CmeelConfig:
@@ -16,18 +24,19 @@ class CmeelConfig:
     def __init__(self) -> None:
         """Get config variables from environment, local, and global config files."""
         config_home = Path("~/.config").expanduser()
-        config_home = Path(os.environ.get("XDG_CONFIG_HOME", config_home))
+        config_home = Path(environ.get("XDG_CONFIG_HOME", config_home))
         config_path = config_home / "cmeel"
         config_file = config_path / "cmeel.toml"
 
         self.conf = {}
         if config_file.exists():
             with config_file.open("rb") as f:
-                self.conf = tomli.load(f)
+                self.conf = tomllib.load(f)
         if self.conf.get("default-env", True):
-            self.env = os.environ.copy()
+            self.env = environ.copy()
         else:
-            self.env = {p: os.environ[p] for p in ["PATH", "PYTHONPATH"]}
+            self.env = {p: environ[p] for p in ["PATH", "PYTHONPATH"]}
+        self.env["CMEEL_BUILD"] = "1"
         self.jobs = int(self.conf.get("jobs", self.env.get("CMEEL_JOBS", "4")))
         self.test_jobs = self.conf.get(
             "test-jobs",
@@ -49,53 +58,65 @@ class CmeelConfig:
 
     def get_configure_args(
         self,
-        conf: Dict[str, Any],
+        conf: dict[str, Any],
         install: Union[Path, str],
-        configure_args: List[str],
-        configure_env: Dict[str, str],
+        configure_args: list[str],
+        configure_env: dict[str, str],
         run_tests: bool,
-    ) -> List[str]:
+    ) -> list[str]:
         """Get CMake initial arguments."""
         project = conf["name"]
-        build_testing: List[str] = [] if run_tests else ["-DBUILD_TESTING=OFF"]
+        build_testing: list[str] = [] if run_tests else ["-DBUILD_TESTING=OFF"]
         ret = [
             "-DBoost_NO_WARN_NEW_VERSIONS=ON",
             "-DCMAKE_BUILD_TYPE=Release",
             "-DCMAKE_INSTALL_LIBDIR=lib",
             f"-DCMAKE_INSTALL_PREFIX={install}",
             f"-DPYTHON_SITELIB={SITELIB}",
+            f"-DPython_EXECUTABLE={sys.executable}",
             f"-DPython3_EXECUTABLE={sys.executable}",
             "-DCMAKE_APPLE_SILICON_PROCESSOR=arm64",
+            f"-DCMEEL_JOBS={self.jobs}",
             *build_testing,
             *configure_args,
             *self.conf.get("configure-args", []),
         ]
         if project in self.conf:
             ret += self.conf[project].get("configure-args", [])
-        if "CMEEL_CMAKE_ARGS" in configure_env and configure_env["CMEEL_CMAKE_ARGS"]:
+        if configure_env.get("CMEEL_CMAKE_ARGS"):
             ret += configure_env["CMEEL_CMAKE_ARGS"].split()
         return ret
 
-    def get_configure_env(self) -> Dict[str, str]:
+    def get_configure_env(self) -> dict[str, str]:
         """Get CMake initial environment."""
         ret = self.env.copy()
-        available = self._get_available_prefix()
-        if available:
+        if available := self._get_available_prefix():
+            ret["CMEEL_AVAILABLE_PREFIX"] = str(available)
             cpp = ret.get("CMAKE_PREFIX_PATH", "")
-            if available not in cpp.split(":"):
-                ret["CMAKE_PREFIX_PATH"] = f"{available}:{cpp}".strip(":")
+            if str(available) not in cpp.split(pathsep):
+                ret["CMAKE_PREFIX_PATH"] = f"{available}{pathsep}{cpp}".strip(pathsep)
+            pcp = ret.get("PKG_CONFIG_PATH", "")
+            for subdir in ("lib", "share"):
+                lpcp = available / subdir / "pkgconfig"
+                if lpcp.is_dir() and str(lpcp) not in pcp.split(pathsep):
+                    pcp = f"{lpcp}{pathsep}{pcp}"
+            ret["PKG_CONFIG_PATH"] = pcp.strip(pathsep)
         return ret
 
-    def get_test_env(self) -> Dict[str, str]:
+    def get_test_env(self) -> dict[str, str]:
         """Get test environment."""
         ret = self.env.copy()
-        ret.update(CTEST_OUTPUT_ON_FAILURE="1", CTEST_PARALLEL_LEVEL=self.test_jobs)
+        ret.update(
+            CTEST_OUTPUT_ON_FAILURE="1",
+            CTEST_PARALLEL_LEVEL=self.test_jobs,
+            LD_LIBRARY_PATH=get_paths("lib"),
+        )
         return ret
 
-    def _get_available_prefix(self) -> Optional[str]:
+    def _get_available_prefix(self) -> Optional[Path]:
         for path in sys.path:
             if CMEEL_PREFIX in path:
-                return str(Path(path).parent.parent.parent)
+                return Path(path).parent.parent.parent
         return None
 
 

cmeel-0.59.0/cmeel/consts.py

@@ -0,0 +1,13 @@
+"""Cmeel constants."""
+
+import os
+import sys
+
+# vvv Warning: keep sync with cmeel_pth.py
+CMEEL_PREFIX = "cmeel.prefix"
+SITELIB = os.path.join(  # noqa: PTH118
+    "lib",
+    "python" + ".".join(sys.version.split(".")[:2]),
+    "site-packages",
+)
+# ^^^

{cmeel-0.41.0 → cmeel-0.59.0}/cmeel/docker.py

@@ -1,9 +1,12 @@
 """Build a project with cmeel in a container."""
 
 import logging
+import os
 import pathlib
 from subprocess import check_call
-from typing import List
+from typing import Optional
+
+from .backports import BooleanOptionalAction
 
 LOG = logging.getLogger("cmeel.docker")
 
@@ -20,7 +23,7 @@ def add_docker_arguments(subparsers):
     sub.add_argument(
         "-p",
         "--python",
-        default="python3.11",
+        default="python3.13",
         help="python interpreter inside that image",
     )
     sub.add_argument(
@@ -53,6 +56,12 @@ def add_docker_arguments(subparsers):
         action="append",
         help="pass environment variables to docker run",
     )
+    sub.add_argument(
+        "--cmeel-env",
+        action=BooleanOptionalAction,
+        default=True,
+        help="forward 'CMEEL_*' environment variables to docker run",
+    )
     sub.set_defaults(cmd="docker")
 
 
@@ -63,7 +72,8 @@ def docker_build(
     cache: bool,
     upgrade: bool,
     cwd: str,
-    env: List[str],
+    env: Optional[list[str]],
+    cmeel_env: bool,
     **kwargs,
 ):
     """Build a project with cmeel in a container."""
@@ -73,9 +83,14 @@ def docker_build(
         check_call(pull)
 
     volumes = ["-v", f"{cwd}/:/src"]
-    envs: List[str] = []
-    for e in env:
-        envs = [*envs, "-e", e]
+    envs: list[str] = []
+    if env:
+        for e in env:
+            envs = [*envs, "-e", e]
+    if cmeel_env:
+        for e in os.environ:
+            if e.startswith("CMEEL_"):
+                envs = [*envs, "-e", e]
     if cache:
         volumes = [*volumes, "-v", "/root/.cache/pip:/root/.cache/pip"]
     docker = ["docker", "run", "--rm", *envs, *volumes, "-w", "/src", "-t", image]

cmeel-0.41.0/cmeel/helpers.py → cmeel-0.59.0/cmeel/env.py

@@ -29,7 +29,7 @@ def get_paths(cmd: str, prepend: bool = False, **kwargs) -> str:
     elif cmd == "pc":
         prefixes = [p / sub / "pkgconfig" for p in prefixes for sub in ["lib", "share"]]
 
-    available = [str(p) for p in prefixes if p.exists()]
+    available = [str(p) for p in prefixes if p.is_dir()]
     if prepend:
         ret = []
         for prefix in available + os.environ.get(PATHS[cmd], "").split(os.pathsep):