genie-python 26.2.0__tar.gz → 26.2.1__tar.gz

{genie_python-26.2.0 → genie_python-26.2.1}/.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Build a binary wheel and a source tarball
       run: python3 -m build
     - name: Store the distribution packages
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: python-package-distributions
         path: dist/
@@ -43,7 +43,7 @@ jobs:
       id-token: write  # IMPORTANT: mandatory for trusted publishing
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v7
+      uses: actions/download-artifact@v8
       with:
         name: python-package-distributions
         path: dist/
@@ -62,7 +62,7 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v7
+      uses: actions/download-artifact@v8
       with:
         name: python-package-distributions
         path: dist/

{genie_python-26.2.0/src/genie_python.egg-info → genie_python-26.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genie_python
-Version: 26.2.0
+Version: 26.2.1
 Summary: Instrument control & scripting for the ISIS Neutron & Muon source
 Author-email: ISIS Experiment Controls <ISISExperimentControls@stfc.ac.uk>
 Maintainer-email: ISIS Experiment Controls <ISISExperimentControls@stfc.ac.uk>

genie_python-26.2.1/src/genie_python/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '26.2.1'
+__version_tuple__ = version_tuple = (26, 2, 1)
+
+__commit_id__ = commit_id = 'g0781cca87'

{genie_python-26.2.0 → genie_python-26.2.1}/src/genie_python/genie.py

@@ -43,7 +43,7 @@ from genie_python.utilities import (  # noqa E402
 )
 from genie_python.version import VERSION  # noqa E402
 
-PVBaseValue = bool | int | float | str
+PVBaseValue = bool | int | float | str | bytes
 PVValue = PVBaseValue | list[PVBaseValue] | npt.NDArray | None  # pyright: ignore
 # because we don't want to make PVValue generic
 
@@ -1475,7 +1475,6 @@ def load_script(name: str, check_script: bool = True, warnings_as_error: bool =
             full_name = get_correct_filepath_existing(name)
         except Exception:
             # Try with default script directory prepended
-
             full_name = get_correct_filepath_existing(os.path.join(get_user_script_dir(), name))
     except Exception:
         raise Exception("Script file was not found (%s)" % get_correct_path(name))
@@ -1559,7 +1558,10 @@ def __load_module(name: str, directory: str) -> types.ModuleType:
     """
     spec = importlib.util.find_spec(name, directory)
     if spec is None:
-        raise ValueError(f"Cannot find spec for module {name} in {directory}")
+        raise ValueError(
+            f"Cannot find spec for module {name} in {directory}. "
+            f"Check that the module name is correct (note: module names are case sensitive)."
+        )
     module = importlib.util.module_from_spec(spec)
 
     err_msg = (
@@ -1579,7 +1581,10 @@ def __load_module(name: str, directory: str) -> types.ModuleType:
 
     module_location = str(module_file)
 
-    if os.path.normpath(os.path.dirname(module_location)) != os.path.normpath(directory):
+    if (
+        os.path.normpath(os.path.dirname(module_location)).lower()
+        != os.path.normpath(directory).lower()
+    ):
         raise ValueError(err_msg)
 
     sys.modules[name] = module

{genie_python-26.2.0 → genie_python-26.2.1/src/genie_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genie_python
-Version: 26.2.0
+Version: 26.2.1
 Summary: Instrument control & scripting for the ISIS Neutron & Muon source
 Author-email: ISIS Experiment Controls <ISISExperimentControls@stfc.ac.uk>
 Maintainer-email: ISIS Experiment Controls <ISISExperimentControls@stfc.ac.uk>

genie_python-26.2.0/src/genie_python/_version.py

@@ -1,34 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
-else:
-    VERSION_TUPLE = object
-    COMMIT_ID = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
-
-__version__ = version = '26.2.0'
-__version_tuple__ = version_tuple = (26, 2, 0)
-
-__commit_id__ = commit_id = 'g4a4b13072'