pytmc 2.18.0__tar.gz → 2.18.2__tar.gz

{pytmc-2.18.0/pytmc.egg-info → pytmc-2.18.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pytmc
-Version: 2.18.0
+Version: 2.18.2
 Summary: Generate Epics DB records from TwinCAT .tmc files
 Author: SLAC National Accelerator Laboratory
 License: Copyright (c) 2023, The Board of Trustees of the Leland Stanford Junior

{pytmc-2.18.0 → pytmc-2.18.2}/docs/source/release_notes.rst

@@ -2,6 +2,21 @@
  Release History
 =================
 
+v2.18.2 (2025-02-12)
+====================
+
+Changes
+-------
+- Add support for TwinCAT 4026 structures that store certain xti files in folders
+  adjacent to their locations in 4024.
+
+
+v2.18.1 (2025-02-11)
+====================
+
+Due to an error, no functional changes in this tag. Please use the next tag instead.
+
+
 v2.18.0 (2024-12-19)
 ====================
 

{pytmc-2.18.0 → pytmc-2.18.2}/pytmc/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.18.0'
-__version_tuple__ = version_tuple = (2, 18, 0)
+__version__ = version = '2.18.2'
+__version_tuple__ = version_tuple = (2, 18, 2)

{pytmc-2.18.0 → pytmc-2.18.2}/pytmc/parser.py

@@ -147,7 +147,7 @@ def element_to_class_name(
     return tag, TwincatItem
 
 
-def _determine_path(base_path, name, class_hint):
+def _determine_path(base_path, name, class_hint) -> pathlib.Path:
     """
     Determine the path to load child XTI items from, given a base path and the
     class load path hint.
@@ -429,7 +429,19 @@ class TwincatItem:
             name=parent.name,
             class_hint=cls._load_path_hint,
         )
-        return parse(base_path / filename, parent=parent)
+        try:
+            return parse(base_path / filename, parent=parent)
+        except FileNotFoundError as exc:
+            original_error = exc
+        # TwinCAT is weird, let's do a best-effort glob through directories parallel to base_path
+        for try_dir in base_path.parent.glob("*"):
+            if try_dir.is_dir():
+                try:
+                    return parse(try_dir / filename, parent=parent)
+                except FileNotFoundError:
+                    ...
+        # We tried I guess
+        raise original_error
 
 
 class _LazyLoadPlaceholder:

{pytmc-2.18.0 → pytmc-2.18.2/pytmc.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pytmc
-Version: 2.18.0
+Version: 2.18.2
 Summary: Generate Epics DB records from TwinCAT .tmc files
 Author: SLAC National Accelerator Laboratory
 License: Copyright (c) 2023, The Board of Trustees of the Leland Stanford Junior