imas-python 2.3.0__tar.gz → 2.3.1__tar.gz

{imas_python-2.3.0 → imas_python-2.3.1}/.github/dependabot.yml

@@ -7,4 +7,9 @@ updates:
     # Check for updates once a week
     schedule:
       interval: "weekly"
+    # Group actions version bumps into a single PR
+    groups:
+      actions-deps:
+        patterns:
+          - "*"
 

{imas_python-2.3.0 → imas_python-2.3.1}/.github/workflows/linting.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
       - name: Checkout IMAS-Python sources
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           # until saxonche is available in 3.13
           # https://saxonica.plan.io/issues/6561

{imas_python-2.3.0 → imas_python-2.3.1}/.github/workflows/publish.yml

@@ -10,11 +10,11 @@ jobs:
     name: Build distribution
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 0 
     - name: Set up Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v7
       with:
         # until saxonche is available in 3.13
         # https://saxonica.plan.io/issues/6561

{imas_python-2.3.0 → imas_python-2.3.1}/.github/workflows/test_with_pytest.yml

@@ -14,11 +14,11 @@ jobs:
     
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Set up Python ${{ matrix.python-version }}
 
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
       - name: Display Python version

{imas_python-2.3.0/imas_python.egg-info → imas_python-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imas-python
-Version: 2.3.0
+Version: 2.3.1
 Summary: Pythonic wrappers for the IMAS Access Layer
 Author: ITER Organization
 Author-email: Karel Lucas van de Plassche <karelvandeplassche@gmail.com>, Daan van Vugt <dvanvugt@ignitioncomputing.com>, Maarten Sebregts <msebregts@ignitioncomputing.com>, imas-support@iter.org

{imas_python-2.3.0 → imas_python-2.3.1}/docs/source/changelog.rst

@@ -3,6 +3,23 @@
 Changelog
 =========
 
+What's new in IMAS-Python 2.3.1
+-------------------------------
+
+Improvements
+''''''''''''
+
+- :merge:`140`: improve performance of ``hasattr()`` on IDS structures 
+- :merge:`139`: improve performance of :py:meth:`~imas.ids_toplevel.IDSToplevel.validate` for large arrays of structures
+
+Bugs
+''''
+
+- :issue:`146`: Fix creation of MDSplus models, regression since 2.2.0 when used together with IMAS-Core >= 5.6
+- Fix broken test (due to breaking change in xxhash>=4 dep)
+
+
+
 What's new in IMAS-Python 2.3.0
 -------------------------------
 

{imas_python-2.3.0 → imas_python-2.3.1}/imas/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.3.0'
-__version_tuple__ = version_tuple = (2, 3, 0)
+__version__ = version = '2.3.1'
+__version_tuple__ = version_tuple = (2, 3, 1)
 
-__commit_id__ = commit_id = 'g474bc8bbe'
+__commit_id__ = commit_id = 'gdc78cc36c'

{imas_python-2.3.0 → imas_python-2.3.1}/imas/backends/imas_core/mdsplus_model.py

@@ -12,7 +12,7 @@ import tempfile
 import time
 import uuid
 from pathlib import Path
-from subprocess import CalledProcessError, check_output
+from subprocess import STDOUT, CalledProcessError, check_output
 from zlib import crc32
 from packaging.version import Version
 
@@ -324,12 +324,19 @@ def create_mdsplus_model(cache_dir_path: Path) -> None:
                 "Could not determine CompileTree class in jTraverser.jar."
             )
         compiletree = compiletree_class.rpartition(".class")[0].replace("/", ".")
+        # only add option to suppress warning if the JVM supports it
+        native_access = ["--enable-native-access=ALL-UNNAMED"]
+        try:
+            check_output(["java", *native_access, "-version"], stderr=STDOUT)
+        except CalledProcessError:
+            native_access = []
         check_output(
             [
                 "java",
                 "-Xms1g",  # what do these do?
                 "-Xmx8g",  # what do these do?
                 "-XX:+UseG1GC",  # what do these do?
+                *native_access,
                 "-cp",
                 jarfile,
                 compiletree,
@@ -339,13 +346,14 @@ def create_mdsplus_model(cache_dir_path: Path) -> None:
             env={
                 "PATH": os.environ.get("PATH", ""),
                 "LD_LIBRARY_PATH": os.environ.get("LD_LIBRARY_PATH", ""),
-                get_mdsplus_model_var(): str(cache_dir_path),
+                # MDSplus locates models through '<tree>_path' (tree='ids')
+                "ids_path": str(cache_dir_path),
             },
         )
         # Touch a file to show that we have finished the model
         (cache_dir_path / "done.txt").touch()
     except CalledProcessError as e:
-        logger.error("Error making MDSPlus model in {path}", cache_dir_path)
+        logger.error("Error making MDSPlus model in %s", cache_dir_path)
         raise e
 
 

{imas_python-2.3.0 → imas_python-2.3.1}/imas/ids_coordinates.py

@@ -81,7 +81,7 @@ class IDSCoordinate:
                     logger.debug(
                         f"Ignoring invalid coordinate specifier {spec}", exc_info=True
                     )
-        self.references: "tuple[IDSPath]" = tuple(refs)
+        self.references: "tuple[IDSPath, ...]" = tuple(refs)
         """A tuple paths that this coordinate refers to.
         """
 
@@ -357,7 +357,6 @@ class IDSCoordinates:
         IDSPath.goto().
         """
         did_capture = []
-        path = self._node._path
         try:
             yield did_capture
         except CoordinateLookupError as exc:
@@ -365,6 +364,7 @@ class IDSCoordinates:
         except IndexError as exc:
             # Can happen in IDSPath.goto when an invalid index is encountered.
             coordinate_refs = coordinate.format_refs(self._node)
+            path = self._node._path
             raise ValidationError(
                 f"Error while validating element `{path}`: dimension {dim + 1} has an "
                 f"invalid index for coordinate(s) {coordinate_refs}."
@@ -372,13 +372,14 @@ class IDSCoordinates:
         except Exception as exc:
             # Ignore all other exceptions and log them
             if "Unexpected index" in str(exc):
-                logger.debug(
-                    "Ignored AoS coordinate outside our tree (see IMAS-4675) of "
-                    "element `%s`, dimension %s, coordinate `%s`",
-                    path,
-                    dim,
-                    coordinate.references,
-                )
+                if logger.isEnabledFor(logging.DEBUG):
+                    logger.debug(
+                        "Ignored AoS coordinate outside our tree (see IMAS-4675) "
+                        "of element `%s`, dimension %s, coordinate `%s`",
+                        self._node._path,
+                        dim,
+                        coordinate.references,
+                    )
             else:
                 if self._node._version <= "3.38.1":
                     version_error = (
@@ -395,7 +396,7 @@ class IDSCoordinates:
                     coordinate.references,
                     dim,
                     version_error,
-                    exc_info=1,
+                    exc_info=True,
                 )
             # Flag to the caller that an error was suppressed
             did_capture.append(1)

{imas_python-2.3.0 → imas_python-2.3.1}/imas/ids_structure.py

@@ -57,7 +57,7 @@ class IDSStructure(IDSBase):
     def __getattr__(self, name):
         if name not in self._children:
             raise AttributeError(
-                f"IDS structure '{self._path}' has no attribute '{name}'"
+                f"IDS structure '{self.metadata.path_string}' has no attribute '{name}'"
             )
         # Create child node
         child_meta = self._children[name]

{imas_python-2.3.0 → imas_python-2.3.1}/imas/test/test_hash.py

@@ -27,7 +27,7 @@ def test_hash_str1d(minimal):
         "multiple entries to test!",
     ]
     minimal.str_1d = string_list
-    hashes = list(map(xxh3_64_digest, string_list))
+    hashes = [xxh3_64_digest(s.encode("utf-8")) for s in string_list]
     expected = xxh3_64_digest(struct.pack("<Q", len(string_list)) + b"".join(hashes))
     assert expected == b"\x98\x011\x9dx+\x0e\xc0"
     assert imas.util.calc_hash(minimal.str_1d) == expected

{imas_python-2.3.0 → imas_python-2.3.1/imas_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imas-python
-Version: 2.3.0
+Version: 2.3.1
 Summary: Pythonic wrappers for the IMAS Access Layer
 Author: ITER Organization
 Author-email: Karel Lucas van de Plassche <karelvandeplassche@gmail.com>, Daan van Vugt <dvanvugt@ignitioncomputing.com>, Maarten Sebregts <msebregts@ignitioncomputing.com>, imas-support@iter.org

{imas_python-2.3.0 → imas_python-2.3.1}/imas_python.egg-info/SOURCES.txt

@@ -219,6 +219,8 @@ imas_python.egg-info/SOURCES.txt
 imas_python.egg-info/dependency_links.txt
 imas_python.egg-info/entry_points.txt
 imas_python.egg-info/requires.txt
+imas_python.egg-info/scm_file_list.json
+imas_python.egg-info/scm_version.json
 imas_python.egg-info/top_level.txt
 tools/compare_lowlevel_access_patterns.py
 tools/get_tagnames.py

imas_python-2.3.1/imas_python.egg-info/scm_file_list.json

@@ -0,0 +1,221 @@
+{
+  "files": [
+    ".git-blame-ignore-revs",
+    ".git_archival.txt",
+    ".gitattributes",
+    ".github/CODEOWNERS",
+    ".github/dependabot.yml",
+    ".github/workflows/linting.yml",
+    ".github/workflows/publish.yml",
+    ".github/workflows/test_with_pytest.yml",
+    ".gitignore",
+    ".pylintrc",
+    ".readthedocs.yml",
+    "CODE_OF_CONDUCT.md",
+    "CONTRIBUTING.md",
+    "LICENSE.txt",
+    "MANIFEST.in",
+    "README.md",
+    "asv.conf.json",
+    "benchmarks/__init__.py",
+    "benchmarks/core_profiles.py",
+    "benchmarks/edge_profiles.py",
+    "benchmarks/technical.py",
+    "benchmarks/utils.py",
+    "conftest.py",
+    "docs/.gitignore",
+    "docs/Makefile",
+    "docs/source/.gitignore",
+    "docs/source/_static/imas.css",
+    "docs/source/_static/imas_200x200.png",
+    "docs/source/_templates/autosummary/accessor.rst",
+    "docs/source/_templates/autosummary/accessor_attribute.rst",
+    "docs/source/_templates/autosummary/accessor_callable.rst",
+    "docs/source/_templates/autosummary/accessor_method.rst",
+    "docs/source/_templates/autosummary/base.rst",
+    "docs/source/_templates/custom-class-template.rst",
+    "docs/source/_templates/custom-module-template.rst",
+    "docs/source/_templates/layout.html",
+    "docs/source/api-hidden.rst",
+    "docs/source/api.rst",
+    "docs/source/benchmarking.rst",
+    "docs/source/changelog.rst",
+    "docs/source/ci_config.rst",
+    "docs/source/cli.rst",
+    "docs/source/code_style.rst",
+    "docs/source/conf.py",
+    "docs/source/configuring.rst",
+    "docs/source/courses/advanced/dd_versions.rst",
+    "docs/source/courses/advanced/explore.rst",
+    "docs/source/courses/advanced/hashing.rst",
+    "docs/source/courses/advanced/imas_snippets/alternative_coordinates.py",
+    "docs/source/courses/advanced/imas_snippets/autoconvert_get.py",
+    "docs/source/courses/advanced/imas_snippets/autoconvert_put.py",
+    "docs/source/courses/advanced/imas_snippets/calc_with_units.py",
+    "docs/source/courses/advanced/imas_snippets/coordinates.py",
+    "docs/source/courses/advanced/imas_snippets/dd_versions.py",
+    "docs/source/courses/advanced/imas_snippets/explore_data.py",
+    "docs/source/courses/advanced/imas_snippets/explore_structures.py",
+    "docs/source/courses/advanced/imas_snippets/hashing.py",
+    "docs/source/courses/advanced/imas_snippets/ids_convert.py",
+    "docs/source/courses/advanced/imas_snippets/ids_to_xarray.py",
+    "docs/source/courses/advanced/imas_snippets/tensorized_ids_to_xarray.py",
+    "docs/source/courses/advanced/metadata.rst",
+    "docs/source/courses/advanced/xarray.rst",
+    "docs/source/courses/advanced_user_training.rst",
+    "docs/source/courses/basic/analyze.rst",
+    "docs/source/courses/basic/core_profiles_ne_timeslice.png",
+    "docs/source/courses/basic/core_profiles_te.png",
+    "docs/source/courses/basic/create.rst",
+    "docs/source/courses/basic/explore.rst",
+    "docs/source/courses/basic/imas_inspect.png",
+    "docs/source/courses/basic/imas_snippets/create_core_profiles.py",
+    "docs/source/courses/basic/imas_snippets/explore_data_entry.py",
+    "docs/source/courses/basic/imas_snippets/explore_public_ec_launchers.py",
+    "docs/source/courses/basic/imas_snippets/explore_public_pf_active.py",
+    "docs/source/courses/basic/imas_snippets/explore_training_data.py",
+    "docs/source/courses/basic/imas_snippets/find_paths.py",
+    "docs/source/courses/basic/imas_snippets/iterate_core_profiles.py",
+    "docs/source/courses/basic/imas_snippets/plot_core_profiles_ne_timeslice.py",
+    "docs/source/courses/basic/imas_snippets/plot_core_profiles_te.py",
+    "docs/source/courses/basic/imas_snippets/print_idss.py",
+    "docs/source/courses/basic/imas_snippets/read_core_profiles_ne_timeslice.py",
+    "docs/source/courses/basic/imas_snippets/read_equilibrium_time_array.py",
+    "docs/source/courses/basic/imas_snippets/read_whole_equilibrium.py",
+    "docs/source/courses/basic/imas_snippets/transform_grid.py",
+    "docs/source/courses/basic/interactive_tab_core_profiles_toplevel.png",
+    "docs/source/courses/basic/print_tree_ids_properties.png",
+    "docs/source/courses/basic/setup.rst",
+    "docs/source/courses/basic/transform.rst",
+    "docs/source/courses/basic_user_training.rst",
+    "docs/source/examples.rst",
+    "docs/source/examples/custom_conversion_em_coupling.py",
+    "docs/source/examples/custom_conversion_em_coupling.rst",
+    "docs/source/identifiers.rst",
+    "docs/source/imas_architecture.rst",
+    "docs/source/imas_structure.png",
+    "docs/source/index.rst",
+    "docs/source/installing.rst",
+    "docs/source/intro.rst",
+    "docs/source/lazy_loading.rst",
+    "docs/source/mdsplus.rst",
+    "docs/source/metadata.rst",
+    "docs/source/multi-dd.rst",
+    "docs/source/netcdf.rst",
+    "docs/source/netcdf/conventions.rst",
+    "docs/source/release_imas.rst",
+    "docs/source/resampling.rst",
+    "docs/source/validation.rst",
+    "imas/__init__.py",
+    "imas/__main__.py",
+    "imas/_to_xarray.py",
+    "imas/_util.py",
+    "imas/assets/IDSDef2MDSpreTree.xsl",
+    "imas/assets/IDS_fake_toplevel.xml",
+    "imas/assets/IDS_minimal.xml",
+    "imas/assets/IDS_minimal_2.xml",
+    "imas/assets/IDS_minimal_struct_array.xml",
+    "imas/assets/IDS_minimal_types.xml",
+    "imas/assets/ITER_134173_106_core_profiles.ids",
+    "imas/assets/ITER_134173_106_equilibrium.ids",
+    "imas/assets/README.md",
+    "imas/assets/core_profiles.ids",
+    "imas/assets/equilibrium.ids",
+    "imas/backends/__init__.py",
+    "imas/backends/db_entry_impl.py",
+    "imas/backends/imas_core/__init__.py",
+    "imas/backends/imas_core/al_context.py",
+    "imas/backends/imas_core/db_entry_al.py",
+    "imas/backends/imas_core/db_entry_helpers.py",
+    "imas/backends/imas_core/imas_interface.py",
+    "imas/backends/imas_core/mdsplus_model.py",
+    "imas/backends/imas_core/uda_support.py",
+    "imas/backends/netcdf/__init__.py",
+    "imas/backends/netcdf/db_entry_nc.py",
+    "imas/backends/netcdf/ids2nc.py",
+    "imas/backends/netcdf/ids_tensorizer.py",
+    "imas/backends/netcdf/iterators.py",
+    "imas/backends/netcdf/nc2ids.py",
+    "imas/backends/netcdf/nc_metadata.py",
+    "imas/backends/netcdf/nc_validate.py",
+    "imas/command/cli.py",
+    "imas/command/db_analysis.py",
+    "imas/command/helpers.py",
+    "imas/command/timer.py",
+    "imas/convert_core_edge_plasma.py",
+    "imas/db_entry.py",
+    "imas/dd_zip.py",
+    "imas/exception.py",
+    "imas/ids_base.py",
+    "imas/ids_convert.py",
+    "imas/ids_coordinates.py",
+    "imas/ids_data_type.py",
+    "imas/ids_defs.py",
+    "imas/ids_factory.py",
+    "imas/ids_identifiers.py",
+    "imas/ids_metadata.py",
+    "imas/ids_path.py",
+    "imas/ids_primitive.py",
+    "imas/ids_struct_array.py",
+    "imas/ids_structure.py",
+    "imas/ids_toplevel.py",
+    "imas/setup_logging.py",
+    "imas/test/test_all_dd_versions.py",
+    "imas/test/test_cli.py",
+    "imas/test/test_convert_core_edge_plasma.py",
+    "imas/test/test_dbentry.py",
+    "imas/test/test_dbentry_uda.py",
+    "imas/test/test_dd_zip.py",
+    "imas/test/test_deepcopy.py",
+    "imas/test/test_exception.py",
+    "imas/test/test_get_sample.py",
+    "imas/test/test_hash.py",
+    "imas/test/test_helpers.py",
+    "imas/test/test_identifiers.py",
+    "imas/test/test_ids2nc.py",
+    "imas/test/test_ids_ascii_data.py",
+    "imas/test/test_ids_convert.py",
+    "imas/test/test_ids_coordinates.py",
+    "imas/test/test_ids_data_type.py",
+    "imas/test/test_ids_factory.py",
+    "imas/test/test_ids_metadata.py",
+    "imas/test/test_ids_mixin.py",
+    "imas/test/test_ids_path.py",
+    "imas/test/test_ids_primitive.py",
+    "imas/test/test_ids_struct_array.py",
+    "imas/test/test_ids_structure.py",
+    "imas/test/test_ids_toplevel.py",
+    "imas/test/test_ids_validate.py",
+    "imas/test/test_latest_dd_autofill.py",
+    "imas/test/test_latest_dd_manual.py",
+    "imas/test/test_latest_dd_resample.py",
+    "imas/test/test_lazy_loading.py",
+    "imas/test/test_list_filled_paths.py",
+    "imas/test/test_list_occurrences.py",
+    "imas/test/test_minimal.py",
+    "imas/test/test_minimal_conversion.py",
+    "imas/test/test_minimal_io.py",
+    "imas/test/test_minimal_struct_array_io.py",
+    "imas/test/test_minimal_types.py",
+    "imas/test/test_minimal_types_io.py",
+    "imas/test/test_minimal_types_io_automatic.py",
+    "imas/test/test_nbc_change.py",
+    "imas/test/test_nc_autofill.py",
+    "imas/test/test_nc_entry.py",
+    "imas/test/test_nc_metadata.py",
+    "imas/test/test_nc_validation.py",
+    "imas/test/test_snippets.py",
+    "imas/test/test_static_ids.py",
+    "imas/test/test_str_1d.py",
+    "imas/test/test_time_slicing.py",
+    "imas/test/test_to_xarray.py",
+    "imas/test/test_uda_support.py",
+    "imas/test/test_util.py",
+    "imas/training.py",
+    "imas/util.py",
+    "pyproject.toml",
+    "setup.cfg",
+    "tools/compare_lowlevel_access_patterns.py",
+    "tools/get_tagnames.py"
+  ]
+}

imas_python-2.3.1/imas_python.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.3.1",
+  "distance": 0,
+  "node": "gdc78cc36c6a86445b06af88890d144a045de91da",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-11-02"
+}