cmeel 0.50.2__tar.gz → 0.52.1__tar.gz

{cmeel-0.50.2 → cmeel-0.52.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmeel
-Version: 0.50.2
+Version: 0.52.1
 Summary: Create Wheel from CMake projects
 Home-page: https://github.com/cmake-wheel/cmeel
 License: BSD-2-Clause
@@ -16,13 +16,14 @@ 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.12
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: System :: Archiving :: Packaging
 Classifier: Topic :: System :: Software Distribution
 Provides-Extra: build
-Requires-Dist: cmake (>=3.27.2,<4.0.0) ; extra == "build"
+Requires-Dist: cmake (>=3.27.7,<4.0.0) ; extra == "build"
 Requires-Dist: git-archive-all (>=1.23.1,<2.0.0) ; extra == "build"
-Requires-Dist: packaging (>=23.1,<24.0) ; extra == "build"
+Requires-Dist: packaging (>=23.2,<24.0) ; extra == "build"
 Requires-Dist: tomli (>=2.0.1,<3.0.0) ; python_version < "3.11"
 Requires-Dist: wheel (>=0.41.1,<0.42.0) ; extra == "build"
 Project-URL: Documentation, https://cmeel.readthedocs.io/
@@ -34,7 +35,9 @@ Description-Content-Type: text/markdown
 [![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)
+[![Poetry](https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json)](https://python-poetry.org/)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v1.json)](https://github.com/charliermarsh/ruff)
 
 Wheel build backend using CMake, to package anything with pip and distribute on PyPI.
@@ -63,7 +66,7 @@ This Install in `${PYTHON_SITELIB}/cmeel.prefix/`:
   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 packages installed with cmeel
-- Stuff in `${PYTHON_SITELIB}/cmeel.prefix/bin` is exposed via `cmeel.run:cmeel_run`
+- 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
 

{cmeel-0.50.2 → cmeel-0.52.1}/README.md

@@ -3,7 +3,9 @@
 [![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)
+[![Poetry](https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json)](https://python-poetry.org/)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v1.json)](https://github.com/charliermarsh/ruff)
 
 Wheel build backend using CMake, to package anything with pip and distribute on PyPI.
@@ -32,7 +34,7 @@ This Install in `${PYTHON_SITELIB}/cmeel.prefix/`:
   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 packages installed with cmeel
-- Stuff in `${PYTHON_SITELIB}/cmeel.prefix/bin` is exposed via `cmeel.run:cmeel_run`
+- 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
 

{cmeel-0.50.2 → cmeel-0.52.1}/cmeel/config.py

@@ -89,8 +89,16 @@ class CmeelConfig:
         available = self._get_available_prefix()
         if available:
             cpp = ret.get("CMAKE_PREFIX_PATH", "")
-            if available not in cpp.split(":"):
+            if str(available) not in cpp.split(":"):
                 ret["CMAKE_PREFIX_PATH"] = f"{available}:{cpp}".strip(":")
+            pcp = ret.get("PKG_CONFIG_PATH", "")
+            lpcp = available / "lib" / "pkgconfig"
+            if lpcp.is_dir() and str(lpcp) not in pcp.split(":"):
+                pcp = f"{lpcp}:{pcp}"
+            spcp = available / "share" / "pkgconfig"
+            if spcp.is_dir() and str(spcp) not in pcp.split(":"):
+                pcp = f"{spcp}:{pcp}"
+            ret["PKG_CONFIG_PATH"] = pcp.strip(":")
         return ret
 
     def get_test_env(self) -> Dict[str, str]:
@@ -99,10 +107,10 @@ class CmeelConfig:
         ret.update(CTEST_OUTPUT_ON_FAILURE="1", CTEST_PARALLEL_LEVEL=self.test_jobs)
         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.52.1/cmeel/consts.py

@@ -0,0 +1,10 @@
+"""Cmeel constants."""
+import os
+import sys
+
+CMEEL_PREFIX = "cmeel.prefix"
+SITELIB = os.path.join(  # noqa: PTH118
+    "lib",
+    "python" + ".".join(sys.version.split(".")[:2]),
+    "site-packages",
+)

{cmeel-0.50.2 → cmeel-0.52.1}/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):

{cmeel-0.50.2 → cmeel-0.52.1}/cmeel/utils.py

@@ -173,8 +173,10 @@ def expose_bin(install: Path, wheel_dir: Path, distribution: str):
         scripts.mkdir(parents=True)
         for fn in bin_dir.glob("*"):
             executable = scripts / fn.name
+            with fn.open("rb") as fo:
+                is_script = fo.read(2) == b"#!"
             with executable.open("w") as fe:
-                fe.write(EXECUTABLE)
+                fe.write(fn.read_text() if is_script else EXECUTABLE)
             executable.chmod(0o755)
 
 

{cmeel-0.50.2 → cmeel-0.52.1}/pyproject.toml

@@ -23,12 +23,12 @@ include = ['cmeel.pth']
 license = "BSD-2-Clause"
 name = "cmeel"
 readme = "README.md"
-version = "0.50.2"
+version = "0.52.1"
 
 [tool.poetry.dependencies]
-cmake = {optional = true, version = "^3.27.2"}
+cmake = {optional = true, version = "^3.27.7"}
 git-archive-all = {optional = true, version = "^1.23.1"}
-packaging = {optional = true, version = "^23.1"}
+packaging = {optional = true, version = "^23.2"}
 python = "^3.8"
 tomli = {python = "< 3.11", version = "^2.0.1"}
 wheel = {optional = true, version = "^0.41.1"}
@@ -40,15 +40,15 @@ build = ["cmake", "git-archive-all", "packaging", "wheel"]
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-black = "^23.7.0"
-furo = "^2023.7.26"
+black = "^23.11.0"
+furo = "^2023.9.10"
 isort = "^5.12.0"
-mypy = "^1.4.1"
+mypy = "^1.7.0"
 myst-parser = "^2.0.0"
 requests = "^2.31.0"
-ruff = "^0.0.282"
+ruff = "^0.1.4"
 # safety = {allow-prereleases = true, version = "^2.4.0b1"} TODO: bump when they fix packaging support
-sphinx = "^7.1.2"
+sphinx = {python = "^3.9", version = "^7.2.6"}
 
 [tool.poetry.scripts]
 cmeel = "cmeel.__main__:main"

cmeel-0.50.2/cmeel/consts.py

@@ -1,8 +0,0 @@
-"""Cmeel constants."""
-import os
-import sys
-
-CMEEL_PREFIX = "cmeel.prefix"
-SITELIB = os.sep.join(  # noqa: PTH118
-    ["lib", "python" + ".".join(sys.version.split(".")[:2]), "site-packages"],
-)