pyxcp 0.22.3__tar.gz → 0.22.5__tar.gz

{pyxcp-0.22.3 → pyxcp-0.22.5}/CMakeLists.txt

@@ -2,7 +2,10 @@
 cmake_minimum_required(VERSION 3.20...3.30)
 project(pyxcp_extensions LANGUAGES C CXX)
 
-cmake_policy(SET CMP0135 NEW)
+
+if(POLICY CMP0135)
+  cmake_policy(SET CMP0135 NEW)
+endif()
 cmake_policy(SET CMP0094 NEW)
 
 find_package(Python3 COMPONENTS Interpreter Development)

{pyxcp-0.22.3 → pyxcp-0.22.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxcp
-Version: 0.22.3
+Version: 0.22.5
 Summary: Universal Calibration Protocol for Python
 Home-page: https://github.com/christoph2/pyxcp
 License: LGPLv3

{pyxcp-0.22.3 → pyxcp-0.22.5}/build_ext.py

@@ -60,7 +60,10 @@ def get_py_config() -> dict:
         arch = None
         if uname.system == "Linux":
             arch = VARS.get("MULTIARCH", "")
+        found = False
         for dir_var in DIR_VARS:
+            if found:
+                break
             dir_name = VARS.get(dir_var)
             if not dir_name:
                 continue
@@ -71,12 +74,15 @@ def get_py_config() -> dict:
             else:
                 print("PF?", uname.system)
             for fp in full_path:
+                print(f"Trying '{fp}'")
                 if fp.exists():
-                    print(f"found Python library: '{full_path}'")
-                    libdir = dir_name
+                    print(f"found Python library: '{fp}'")
+                    libdir = str(fp.parent)
+                    found = True
                     break
-                # else:
-                #    print(f"NOT found: '{full_path}'")
+        if not found:
+            print("Could NOT locate Python library.")
+            return dict(exe=sys.executable, include=include, libdir="", library=library)
     return dict(exe=sys.executable, include=include, libdir=libdir, library=library)
 
 
@@ -98,9 +104,10 @@ def build_extension(debug: bool = False, use_temp_dir: bool = False) -> None:
     cmake_args = [
         f"-DPython3_EXECUTABLE={py_cfg['exe']}",
         f"-DPython3_INCLUDE_DIR={py_cfg['include']}",
-        f"-DPython3_LIBRARY={str(Path(py_cfg['libdir']) / Path(py_cfg['library']))}",
         f"-DCMAKE_BUILD_TYPE={cfg}",  # not used on MSVC, but no harm
     ]
+    if py_cfg["libdir"]:
+        cmake_args.append(f"-DPython3_LIBRARY={str(Path(py_cfg['libdir']) / Path(py_cfg['library']))}")
 
     build_args = ["--config Release", "--verbose"]
     # cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 /path/to/src

{pyxcp-0.22.3 → pyxcp-0.22.5}/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = ["license", "readme", "authors", "requires-python", "description", "cl
 [tool.poetry]
 authors = ["Christoph Schueler <cpu.gems@googlemail.com>"]
 name = "pyxcp"
-version = "0.22.3"
+version = "0.22.5"
 readme = "README.md"
 description = "Universal Calibration Protocol for Python"
 keywords = ["automotive", "ecu", "xcp", "asam", "autosar"]

{pyxcp-0.22.3 → pyxcp-0.22.5}/pyxcp/__init__.py

@@ -17,4 +17,4 @@ tb_install(show_locals=True, max_frames=3)  # Install custom exception handler.
 
 # if you update this manually, do not forget to update
 # .bumpversion.cfg and pyproject.toml.
-__version__ = "0.22.3"
+__version__ = "0.22.5"