imas-python 0.1.dev1634__tar.gz → 0.1.dev1637__tar.gz

{imas_python-0.1.dev1634 → imas_python-0.1.dev1637}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: imas-python
-Version: 0.1.dev1634
+Version: 0.1.dev1637
 Summary: Pythonic wrappers for the IMAS Access Layer
 Author: imas-python developers
 Author-email: Olivier Hoenen <olivier.hoenen@iter.org>

{imas_python-0.1.dev1634 → imas_python-0.1.dev1637}/docs/source/release_imas.rst

@@ -1,14 +1,9 @@
 imas-python development and release process
 ===========================================
 
-imas-python development follows the `Gitflow workflow
-<https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow>`_:
-
-1.  New features, bug fixes, etc. are developed in a separate branch. Typically named
-    ``feature/<feature_description>``, ``bugfix/IMAS-XXXX``, etc.
-2.  When the feature is finished, a Pull Request to the ``develop`` branch is created.
-3.  The PR is reviewed and, after approval, changes are merged to ``develop``.
-4.  The ``main`` branch is updated only on releases, see below.
+imas-python development follows the a fork-based model described in
+`the contributing guidelines
+<https://github.com/iterorganization/imas-python/blob/develop/CONTRIBUTING.md>`_.
 
 
 Creating an imas-python release
@@ -16,10 +11,8 @@ Creating an imas-python release
 
 1.  Create a Pull Request using fork based workflow from ``develop`` to ``main``.
 2.  Add a change log to the Pull Request, briefly describing new features, bug fixes,
-    etc. See, for example, `this PR for version 0.8.0
-    <https://github.com/iterorganization/imas-python/pulls>`_.
-3.  The PR is reviewed and merged by IO (currently Olivier Hoenen, who also creates the
-    release tags).
+    and update accordingly the :ref:`changelog`.
+3.  The PR is reviewed and merged by the maintainers who also create the release tags.
 4.  After the release PR is merged, update the Easybuild configurations for SDCC modules
     in the `easybuild-easyconfigs repository
     <https://git.iter.org/projects/IMEX/repos/easybuild-easyconfigs/browse/easybuild/easyconfigs/i/imas-python>`_.

{imas_python-0.1.dev1634 → imas_python-0.1.dev1637}/imas/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.dev1634'
-__version_tuple__ = version_tuple = (0, 1, 'dev1634')
+__version__ = version = '0.1.dev1637'
+__version_tuple__ = version_tuple = (0, 1, 'dev1637')

{imas_python-0.1.dev1634 → imas_python-0.1.dev1637}/imas/command/cli.py

@@ -77,9 +77,7 @@ def print_version():
     grid.add_row("Available data dictionary versions:", dd_versions)
     grid.add_section()
     try:
-        grid.add_row(
-            "Access Layer core version:", ll_interface.get_al_version() or "N/A"
-        )
+        grid.add_row("Access Layer core version:", ll_interface.get_al_version())
     except Exception:
         grid.add_row("Access Layer core version:", "N/A")
     console.Console().print(grid)

{imas_python-0.1.dev1634 → imas_python-0.1.dev1637}/imas/dd_helpers.py

@@ -25,7 +25,6 @@ def prepare_data_dictionaries():
     3. Generate IDSDef.xml and rename to IDSDef_${version}.xml
     4. Zip all these IDSDefs together and include in wheel
     """
-    print("prepare_data_dictionaries")
     from git import Repo
 
     repo: Repo = get_data_dictionary_repo()

imas_python-0.1.dev1637/imas/test/test_dd_helpers.py

@@ -0,0 +1,57 @@
+from pathlib import Path
+import shutil
+import pytest
+import os
+import zipfile
+
+from imas.dd_helpers import prepare_data_dictionaries, _idsdef_zip_relpath, _build_dir
+
+_idsdef_unzipped_relpath = Path("idsdef_unzipped")
+
+
+def test_prepare_data_dictionaries():
+    prepare_data_dictionaries()
+    assert os.path.exists(
+        _idsdef_zip_relpath
+    ), f"IDSDef.zip file does not exist at path: {_idsdef_zip_relpath}"
+
+    expected_xml_files = [
+        _build_dir / "3.40.0.xml",
+        _build_dir / "3.41.0.xml",
+        _build_dir / "3.42.0.xml",
+        _build_dir / "4.0.0.xml",
+    ]
+
+    for xml_file in expected_xml_files:
+        assert os.path.exists(xml_file), f"{xml_file} does not exist"
+
+    with zipfile.ZipFile(_idsdef_zip_relpath, "r") as zip_ref:
+        zip_ref.extractall(_idsdef_unzipped_relpath)
+
+    expected_ids_directories = [
+        _idsdef_unzipped_relpath / "data-dictionary" / "3.40.0.xml",
+        _idsdef_unzipped_relpath / "data-dictionary" / "3.41.0.xml",
+        _idsdef_unzipped_relpath / "data-dictionary" / "3.42.0.xml",
+        _idsdef_unzipped_relpath / "data-dictionary" / "4.0.0.xml",
+        _idsdef_unzipped_relpath
+        / "identifiers"
+        / "core_sources"
+        / "core_source_identifier.xml",
+        _idsdef_unzipped_relpath
+        / "identifiers"
+        / "equilibrium"
+        / "equilibrium_profiles_2d_identifier.xml",
+    ]
+
+    for file_path in expected_ids_directories:
+        assert os.path.exists(
+            file_path
+        ), f"Expected_ids_directories {file_path} does not exist"
+
+    if _build_dir.exists():
+        shutil.rmtree(_idsdef_unzipped_relpath)
+        print(f"Removed directory: {_idsdef_unzipped_relpath}")
+
+
+if __name__ == "__main__":
+    pytest.main()

{imas_python-0.1.dev1634 → imas_python-0.1.dev1637}/imas_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: imas-python
-Version: 0.1.dev1634
+Version: 0.1.dev1637
 Summary: Pythonic wrappers for the IMAS Access Layer
 Author: imas-python developers
 Author-email: Olivier Hoenen <olivier.hoenen@iter.org>

imas_python-0.1.dev1634/imas/test/test_dd_helpers.py

@@ -1,134 +0,0 @@
-import pytest
-
-from imas.dd_helpers import find_saxon_classpath
-
-# TODO: Write tests!
-# def prepare_data_dictionaries():
-# def get_saxon():
-# def find_saxon_jar():
-
-# Quadruplets of (cluster, module, real path, name)
-saxon_binary_quadruplets = (
-    (
-        "SDCC",
-        "Saxon-HE/10.3-Java-1.8",
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-1.8/saxon-he-10.3.jar",
-        "saxon-he-10.3.jar",
-    ),
-    (
-        "SDCC",
-        "Saxon-HE/10.3-Java-11",
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/saxon-he-10.3.jar",
-        "saxon-he-10.3.jar",
-    ),
-    (
-        "HPC",
-        "Saxon-HE/9.7.0.14-Java-1.6.0_45",
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/9.7.0.14-Java-1.6.0_45/saxon9he.jar",
-        "saxon9he.jar",
-    ),
-    (
-        "HPC",
-        "Saxon-HE/9.7.0.4-Java-1.7.0_79",
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/9.7.0.4-Java-1.7.0_79/saxon9he.jar",
-        "saxon9he.jar",
-    ),
-    (
-        "HPC",
-        "Saxon-HE/9.7.0.21-Java-1.8.0_162",
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/9.7.0.21-Java-1.8.0_162/saxon9he.jar",
-        "saxon9he.jar",
-    ),
-    (
-        "HPC",
-        "Saxon-HE/9.9.1.7-Java-13",
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/9.9.1.7-Java-13/saxon9he.jar",
-        "saxon9he.jar",
-    ),
-    (
-        "HPC",
-        "Saxon-HE/10.3-Java-11",
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/saxon-he-10.3.jar",
-        "saxon-he-10.3.jar",
-    ),
-)
-
-saxon_nonmatches = (
-    "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/saxon-he-test-10.3.jar",
-)
-
-
-# find_saxon_bin tries to find saxon in the CLASSPATH env variable
-# It is thus per definition environment dependent
-def test_empty_classpath(monkeypatch):
-    monkeypatch.setenv("CLASSPATH", "")
-    saxon_jar_path = find_saxon_classpath()
-    assert saxon_jar_path is None
-
-
-@pytest.mark.parametrize("cluster,module,path,name", saxon_binary_quadruplets)
-def test_classpath(monkeypatch, cluster, module, path, name):
-    monkeypatch.setenv("CLASSPATH", path)
-    saxon_jar_path = find_saxon_classpath()
-    assert saxon_jar_path == path
-
-
-@pytest.mark.parametrize("path", saxon_nonmatches)
-def test_classpath_do_not_match(monkeypatch, path):
-    monkeypatch.setenv("CLASSPATH", path)
-    saxon_jar_path = find_saxon_classpath()
-    assert saxon_jar_path is None
-
-
-# ITER SDCC login01 20210617
-# module load GCCcore/10.2.0
-# module load Python/3.8.6-GCCcore-10.2.0
-# module load MDSplus/7.96.17-GCCcore-10.2.0
-# module load HDF5/1.10.7-iimpi-2020b  # todo: Intel MPI version?
-# module load Boost/1.74.0-GCCcore-10.2.0
-# module load MDSplus-Java/7.96.17-GCCcore-10.2.0-Java-11
-# module load Saxon-HE/10.3-Java-11
-def test_classpath_sdcc(monkeypatch):
-    monkeypatch.setenv(
-        "CLASSPATH",
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/saxon-xqj-10.3.jar:"
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/saxon-he-test-10.3.jar:"
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/jline-2.9.jar:"
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/saxon-he-10.3.jar:"
-        "/work/imas/opt/EasyBuild/software/MDSplus-Java/7.96.17-GCCcore-10.2.0-Java-11/java/classes/*",
-    )
-    saxon_jar_path = find_saxon_classpath()
-    assert (
-        saxon_jar_path
-        == "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/saxon-he-10.3.jar"
-    )
-
-
-# ITER HPC login01 20210617
-# module load GCCcore/10.2.0
-# module load Python/3.8.6-GCCcore-10.2.0
-# module load MDSplus/7.96.17-GCCcore-10.2.0
-# module load HDF5/1.10.7-iimpi-2020b  # todo: Intel MPI version?
-# module load Boost/1.74.0-GCCcore-10.2.0
-# module load MDSplus-Java/7.96.17-GCCcore-10.2.0-Java-11
-# module load Saxon-HE/10.3-Java-11
-def test_classpath_hpc(monkeypatch):
-    monkeypatch.setenv(
-        "CLASSPATH",
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/saxon-xqj-10.3.jar:"
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/saxon-he-test-10.3.jar:"
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/jline-2.9.jar:"
-        "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/saxon-he-10.3.jar:"
-        "/work/imas/opt/EasyBuild/software/MDSplus-Java/7.96.17-GCCcore-10.2.0-Java-11/java/classes/*",
-    )
-    saxon_jar_path = find_saxon_classpath()
-    assert (
-        saxon_jar_path
-        == "/work/imas/opt/EasyBuild/software/Saxon-HE/10.3-Java-11/saxon-he-10.3.jar"
-    )
-
-
-# TODO: Write tests!
-# def find_saxon_bin():
-# def get_data_dictionary_repo():
-# def build_data_dictionary():