cmeel 0.57.3__tar.gz → 0.59.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmeel
-Version: 0.57.3
+Version: 0.59.0
 Summary: Create Wheel from CMake projects
 Project-URL: Changelog, https://github.com/cmake-wheel/cmeel/blob/main/CHANGELOG.md
 Project-URL: Documentation, https://cmeel.readthedocs.io/
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: System :: Archiving :: Packaging
 Classifier: Topic :: System :: Software Distribution
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Requires-Dist: tomli>=2.1.0; python_full_version < '3.11'
 Provides-Extra: build
 Requires-Dist: cmake>=3.31.2; extra == 'build'

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

@@ -7,7 +7,7 @@ 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
 
 try:
     import tomllib  # type: ignore
@@ -58,21 +58,22 @@ 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}",
@@ -86,11 +87,11 @@ class CmeelConfig:
             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 str(available) not in cpp.split(pathsep):
                 ret["CMAKE_PREFIX_PATH"] = f"{available}{pathsep}{cpp}".strip(pathsep)
@@ -102,7 +103,7 @@ class CmeelConfig:
             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(

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

@@ -4,7 +4,7 @@ import logging
 import os
 import pathlib
 from subprocess import check_call
-from typing import List, Optional
+from typing import Optional
 
 from .backports import BooleanOptionalAction
 
@@ -72,7 +72,7 @@ def docker_build(
     cache: bool,
     upgrade: bool,
     cwd: str,
-    env: Optional[List[str]],
+    env: Optional[list[str]],
     cmeel_env: bool,
     **kwargs,
 ):
@@ -83,7 +83,7 @@ def docker_build(
         check_call(pull)
 
     volumes = ["-v", f"{cwd}/:/src"]
-    envs: List[str] = []
+    envs: list[str] = []
     if env:
         for e in env:
             envs = [*envs, "-e", e]

{cmeel-0.57.3 → cmeel-0.59.0}/cmeel/metadata.py

@@ -6,12 +6,12 @@ https://packaging.python.org/en/latest/specifications/declaring-project-metadata
 
 import warnings
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Optional, Union
 
 LICENSE_GLOBS = ["LICEN[CS]E*", "COPYING*", "NOTICE*", "AUTHORS*"]
 
 
-def get_license(conf: Dict[str, Any], dist_info: Optional[Path]) -> List[str]:
+def get_license(conf: dict[str, Any], dist_info: Optional[Path]) -> list[str]:
     """Parse 'license' and 'license-files' keys."""
     metadata = []
 
@@ -42,7 +42,7 @@ def get_license(conf: Dict[str, Any], dist_info: Optional[Path]) -> List[str]:
     return metadata
 
 
-def _license_files(license_files: Union[str, List[str], Dict[str, str]]) -> List[str]:
+def _license_files(license_files: Union[str, list[str], dict[str, str]]) -> list[str]:
     """Parse 'license-files' key."""
     lic_files = []
     if isinstance(license_files, str):
@@ -67,7 +67,7 @@ def _license_files(license_files: Union[str, List[str], Dict[str, str]]) -> List
     return lic_files
 
 
-def _license(conf) -> Tuple[str, List[str]]:
+def _license(conf) -> tuple[str, list[str]]:
     """Parse 'license' key."""
     lic_expr, lic_files = "", []
     if "license" in conf:
@@ -94,7 +94,7 @@ def _license(conf) -> Tuple[str, List[str]]:
     return lic_expr, lic_files
 
 
-def get_people(conf: Dict[str, Any], key: str) -> List[str]:
+def get_people(conf: dict[str, Any], key: str) -> list[str]:
     """Parse 'authors' and 'maintainers' keys."""
     metadata = []
 
@@ -116,7 +116,7 @@ def get_people(conf: Dict[str, Any], key: str) -> List[str]:
     return metadata
 
 
-def get_urls(conf: Dict[str, Any]) -> List[str]:
+def get_urls(conf: dict[str, Any]) -> list[str]:
     """Parse 'urls' keys."""
     metadata = []
 
@@ -131,7 +131,7 @@ def get_urls(conf: Dict[str, Any]) -> List[str]:
     return metadata
 
 
-def get_deps(conf: Dict[str, Any], build_deps: List[str]) -> List[str]:
+def get_deps(conf: dict[str, Any], build_deps: list[str]) -> list[str]:
     """Parse 'dependencies' keys."""
     metadata = []
 
@@ -160,7 +160,7 @@ def get_deps(conf: Dict[str, Any], build_deps: List[str]) -> List[str]:
     return metadata
 
 
-def get_readme(conf: Dict[str, Any]) -> List[str]:
+def get_readme(conf: dict[str, Any]) -> list[str]:
     """Parse 'readme' key."""
     metadata = []
 
@@ -192,7 +192,7 @@ def get_readme(conf: Dict[str, Any]) -> List[str]:
     return metadata
 
 
-def _readme_dict(conf: Dict[str, Any]) -> Tuple[str, str, str]:
+def _readme_dict(conf: dict[str, Any]) -> tuple[str, str, str]:
     """Parse 'readme' key when it is a table."""
     readme_file, readme_content, readme_type = "", "", ""
 
@@ -221,7 +221,7 @@ def _ext_type(filename: str) -> str:
     return "text/plain"
 
 
-def get_keywords(conf: Dict[str, Any]) -> List[str]:
+def get_keywords(conf: dict[str, Any]) -> list[str]:
     """Parse 'keyword' key."""
     metadata = []
     if "keywords" in conf:
@@ -230,7 +230,7 @@ def get_keywords(conf: Dict[str, Any]) -> List[str]:
     return metadata
 
 
-def metadata(conf, requires: List[str], dist_info: Optional[Path] = None) -> List[str]:
+def metadata(conf, requires: list[str], dist_info: Optional[Path] = None) -> list[str]:
     """Return the lines which should go in the METADATA / PKG-INFO file."""
     return [
         "Metadata-Version: 2.4",

{cmeel-0.57.3 → cmeel-0.59.0}/cmeel/release.py

@@ -3,7 +3,7 @@
 
 from logging import getLogger
 from pathlib import Path
-from subprocess import check_call
+from subprocess import run
 
 try:
     import tomllib  # type: ignore
@@ -33,15 +33,15 @@ def release(**kwargs):
 
     commit_cmd = ["git", "commit", "-am", release]
     LOG.debug("commit command: %s", commit_cmd)
-    check_call(commit_cmd)
+    run(commit_cmd, check=False)
 
     tag_cmd = ["git", "tag", "-s", tag, "-m", release]
     LOG.debug("tag command: %s", tag_cmd)
-    check_call(tag_cmd)
+    run(tag_cmd, check=True)
 
     push_cmd = ["git", "push", "origin", tag]
     LOG.debug("push command: %s", push_cmd)
-    check_call(push_cmd)
+    run(push_cmd, check=True)
 
 
 if __name__ == "__main__":

{cmeel-0.57.3 → cmeel-0.59.0}/cmeel/utils.py

@@ -104,7 +104,7 @@ def get_tag(pyproject) -> str:
     # ref. https://github.com/pypa/cibuildwheel/blob/6549a9/cibuildwheel/macos.py#L221
     if "_PYTHON_HOST_PLATFORM" in os.environ:
         plat = os.environ["_PYTHON_HOST_PLATFORM"].replace("-", "_").replace(".", "_")
-        tag = "-".join(tag.split("-")[:-1] + [plat])
+        tag = "-".join([*tag.split("-")[:-1], plat])
 
     if deprecate_build_system(pyproject, "py3-none", False):
         warnings.warn(

{cmeel-0.57.3 → cmeel-0.59.0}/pyproject.toml

@@ -34,8 +34,8 @@ description = "Create Wheel from CMake projects"
 license = "BSD-2-Clause"
 name = "cmeel"
 readme = "README.md"
-requires-python = ">=3.8"
-version = "0.57.3"
+requires-python = ">=3.9"
+version = "0.59.0"
 
 [project.optional-dependencies]
 build = [
@@ -59,9 +59,6 @@ include = ["cmeel", "cmeel.pth", "cmeel_pth.py"]
 [tool.hatch.build.targets.wheel]
 include = ["cmeel", "cmeel.pth", "cmeel_pth.py"]
 
-[tool.ruff]
-target-version = "py38"
-
 [tool.ruff.lint]
 extend-ignore = ["COM812", "D203", "D213"]
 extend-select = ["A", "B", "C", "COM", "D", "EM", "EXE", "G", "I", "N", "PTH", "RET", "RUF", "UP", "W", "YTT"]