cmeel 0.54.2__py3-none-any.whl → 0.55.0__py3-none-any.whl

cmeel/config.py

@@ -3,8 +3,8 @@
 Parse various configuration files and environment variables.
 """
 
-import os
 import sys
+from os import environ, pathsep
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Any, Dict, List, Optional, Union
@@ -15,6 +15,7 @@ except ModuleNotFoundError:
     import tomli as tomllib  # type: ignore
 
 from .consts import CMEEL_PREFIX, SITELIB
+from .env import get_paths
 
 
 class CmeelConfig:
@@ -23,7 +24,7 @@ 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"
 
@@ -32,9 +33,9 @@ class CmeelConfig:
             with config_file.open("rb") as 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.jobs = int(self.conf.get("jobs", self.env.get("CMEEL_JOBS", "4")))
         self.test_jobs = self.conf.get(
             "test-jobs",
@@ -90,22 +91,24 @@ class CmeelConfig:
         available = self._get_available_prefix()
         if available:
             cpp = ret.get("CMAKE_PREFIX_PATH", "")
-            if str(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", "")
-            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(":")
+            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]:
         """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[Path]:

{cmeel-0.54.2.dist-info → cmeel-0.55.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmeel
-Version: 0.54.2
+Version: 0.55.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/

{cmeel-0.54.2.dist-info → cmeel-0.55.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ cmeel/__main__.py,sha256=gLQ5_di07raiL6u75jpE36QydXlsbBzSdff9mVKtbg4,2042
 cmeel/backports.py,sha256=ZJ34NDWgrlrSkq8AGrKof9SQexQH8sver2HmJIur80c,1473
 cmeel/build.py,sha256=iYcKI1CCiRry2ESee1gUrL71N8-6rC_yie97hCfKgz0,867
 cmeel/cmeel.py,sha256=inrhra_VOA0005ExK4oFNX4EWljbgS4pnx6S0dkvxoA,249
-cmeel/config.py,sha256=aO4dZKiNLcRESXc1kXrKtMIWxJ6dr9ZfnfTe88iLkg8,4054
+cmeel/config.py,sha256=sdELrlIzhND4KcxSaEUTdxxJWX3cF_J35jTCd9YmRRw,4107
 cmeel/consts.py,sha256=ol8loHUtvIkuINu4Go5ko7Sfkb7Ht9XBjjmPP-Sjcoo,252
 cmeel/docker.py,sha256=wT-VZuGKj1wcdldwgsYcWmJK_rjo2Eh1USEDMOmlsBU,2775
 cmeel/env.py,sha256=4AymbjlT3iNqYeeI70u3ZQMpiQfYo2vbNoZ4F15QbYQ,1235
@@ -15,8 +15,8 @@ cmeel/release.py,sha256=svN_mQwu9HeKTF3517zNd0XPkbZeNS21aps6NiW-e7A,1357
 cmeel/run.py,sha256=AaXiEvM7DhI0gbAzjBmBKt7KoHRAD8jrxWRghxXmeec,744
 cmeel/sdist.py,sha256=DA5h9IrQfhuoQucYfv73S8jpKNY2ThfIrVSKSvsJ5ec,1961
 cmeel/utils.py,sha256=1q-iQdhxNXluQoUPME1k34YClFUQ4KSwMcIHpREYHEY,8114
-cmeel-0.54.2.dist-info/METADATA,sha256=RA-WAyF6a8TvCAAR8vAdaFThQnsB6q2P07UMexvY2CA,4818
-cmeel-0.54.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cmeel-0.54.2.dist-info/entry_points.txt,sha256=xtIRc5QUYVGuGehxx2BrMEs3qoQ44cXF7D96_tfpZDM,46
-cmeel-0.54.2.dist-info/licenses/LICENSE,sha256=4QHEuqIDbscybBc21CcazwRjix-rV-AH2QAZ4IqxlzQ,1324
-cmeel-0.54.2.dist-info/RECORD,,
+cmeel-0.55.0.dist-info/METADATA,sha256=kqn21BGzeTJQoJ3PviM9U1WLlAZTvVyrizi_oOKQCK0,4818
+cmeel-0.55.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cmeel-0.55.0.dist-info/entry_points.txt,sha256=xtIRc5QUYVGuGehxx2BrMEs3qoQ44cXF7D96_tfpZDM,46
+cmeel-0.55.0.dist-info/licenses/LICENSE,sha256=4QHEuqIDbscybBc21CcazwRjix-rV-AH2QAZ4IqxlzQ,1324
+cmeel-0.55.0.dist-info/RECORD,,