cubitpy 0.2.2__tar.gz → 0.2.4__tar.gz

{cubitpy-0.2.2 → cubitpy-0.2.4}/.github/workflows/cubitpy_test_suite_with_secrets.yml

@@ -14,7 +14,7 @@ on:
   workflow_dispatch:
 
 env:
-  CUBIT_DOWNLOAD_URL: https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/Releases/Linux/Coreform-Cubit-2025.8%2B61943-Lin64.tar.gz
+  CUBIT_DOWNLOAD_URL: https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/Releases/Linux/Coreform-Cubit-2026.6%2B67683-Lin64.tar.gz
 
 jobs:
   testing_coreform:
@@ -28,14 +28,16 @@ jobs:
       PYTHON_VENV: python-testing-environment
     steps:
       - name: Checkout PR code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           submodules: true
           # For PR runs, checkout PR code; otherwise fallback to default branch or ref
           ref: ${{ github.event.pull_request.head.ref || github.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
+          allow-unsafe-pr-checkout: true # required to checkout PR code from forks, PRs from external people need to be approved anyways
+          persist-credentials: false
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.13
       - name: Install CubitPy
@@ -43,6 +45,7 @@ jobs:
           whoami
           pwd
           # Install dependencies
+          sudo apt update
           sudo apt install libhdf5-dev libnetcdf-dev build-essential
 
           # Install cubitpy

{cubitpy-0.2.2 → cubitpy-0.2.4}/.pre-commit-config.yaml

@@ -73,17 +73,12 @@ repos:
           - --comment-style
           - '#'
           - --no-extra-eol
-  - repo: https://github.com/asmeurer/removestar
-    rev: "1.5.2"
-    hooks:
-      - id: removestar
-        name: Run removestar (remove wildcard imports)
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.2
+    rev: v0.15.20
     hooks:
       - id: ruff # linter
         name: Run ruff (linter for Python)
-        args: ["--fix", "--select", "I,TID252,F401"] # "I => sort imports, TID252 => ban relative imports, F401 => unused imports"
+        args: ["--fix", "--select", "I,TID252,F401,F403"] # I => sort imports, TID252 => ban relative imports, F401 => unused imports, F403 => no wildcard imports
       - id: ruff-format # formatter
         name: Run ruff (formatter for Python)
   - repo: https://github.com/crate-ci/typos

{cubitpy-0.2.2/src/cubitpy.egg-info → cubitpy-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cubitpy
-Version: 0.2.2
+Version: 0.2.4
 Summary: CubitPy: Utility functions and 4C related functionality for the Cubit and Coreform python interface
 Author-email: Ivo Steinbrecher <ivo.steinbrecher@unibw.de>
 License-Expression: MIT
@@ -14,7 +14,7 @@ Requires-Dist: numpy
 Requires-Dist: fourcipp
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest<9.2; extra == "dev"
 Requires-Dist: pytest-benchmark; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: deepdiff; extra == "dev"
@@ -95,6 +95,7 @@ remote_config:
   host: "hostname"
   platform: "windows"
   cubit_path: "C:\\Coreform_Cubit_2025.8"
+on_cubit_error: "raise"  # optional: "raise" (default), "warn" or "ignore"
 ```
 To run CubitPy one can either provide the configuration file then initializing CubitPy, or set an environment variable with the path to the configuration file.
 ```bash

{cubitpy-0.2.2 → cubitpy-0.2.4}/README.md

@@ -73,6 +73,7 @@ remote_config:
   host: "hostname"
   platform: "windows"
   cubit_path: "C:\\Coreform_Cubit_2025.8"
+on_cubit_error: "raise"  # optional: "raise" (default), "warn" or "ignore"
 ```
 To run CubitPy one can either provide the configuration file then initializing CubitPy, or set an environment variable with the path to the configuration file.
 ```bash

{cubitpy-0.2.2 → cubitpy-0.2.4}/pyproject.toml

@@ -31,7 +31,7 @@ Issues = "https://github.com/imcs-compsim/cubitpy/issues/"
 [project.optional-dependencies]
 dev = [
   "pre-commit",
-  "pytest",
+  "pytest<9.2", # TODO: This fixes an incompatibility issue with pytest-benchmark, but should be removed once the issue is fixed upstream
   "pytest-benchmark",
   "pytest-cov",
   "deepdiff",

{cubitpy-0.2.2 → cubitpy-0.2.4}/src/cubitpy/conf.py

@@ -23,7 +23,6 @@
 cubitpy."""
 
 import getpass
-import glob
 import os
 import shutil
 import sys
@@ -108,6 +107,17 @@ class CubitOptions(object):
         # Tolerance for geometry.
         self.eps_pos = 1e-10
 
+    @property
+    def on_cubit_error(self) -> str:
+        """How to react when a cubit command reports an error.
+
+        One of "raise" (default, raise a RuntimeError), "warn" (emit a
+        CubitPyWarning and continue) or "ignore" (silently continue),
+        set via the optional top-level 'on_cubit_error' key in the
+        config file.
+        """
+        return self._get_config().get("on_cubit_error", "raise")
+
     def _get_config(self) -> Dict[str, Any]:
         """Get the config dict or raise an error if not loaded."""
         if self._config is None:
@@ -134,6 +144,8 @@ class CubitOptions(object):
             "\n"
             "local_config:\n"
             '  cubit_path: "<local_cubit_install_path>"\n'
+            "\n"
+            'on_cubit_error: "raise"  # optional: "raise" (default), "warn" or "ignore"\n'
             "----------------------------------------\n"
             "- If mode = 'remote': remote_config MUST exist and contain user, host, platform, cubit_path.\n"
             "- If mode = 'local' : local_config MUST exist and contain cubit_path.\n"
@@ -153,6 +165,12 @@ class CubitOptions(object):
         if mode not in ("remote", "local"):
             fail(f"Invalid cubitpy_mode '{mode}'. Expected 'remote' or 'local'.")
 
+        if config.get("on_cubit_error", "raise") not in ("raise", "warn", "ignore"):
+            fail(
+                f"Invalid on_cubit_error '{config['on_cubit_error']}'. "
+                "Expected 'raise', 'warn' or 'ignore'."
+            )
+
         if mode == "remote":
             if "remote_config" not in config:
                 fail("cubitpy_mode='remote' requires a 'remote_config' section.")
@@ -285,18 +303,20 @@ class CubitOptions(object):
 
         if cubit_platform == "linux" or cubit_platform == "macos":
             if self.is_coreform():
-                pattern = "**/python3"
-                full_pattern = os.path.join(cubit_path, pattern)
-                python3_matches = glob.glob(full_pattern, recursive=True)
-                python3_files = [
-                    path for path in python3_matches if os.path.isfile(path)
+                python_prefix = "python3."
+                python_files = [
+                    path
+                    for path in cubit_path.rglob(f"{python_prefix}*")
+                    if path.is_file()
+                    and path.name.removeprefix(python_prefix).isdigit()
                 ]
-                if not len(python3_files) == 1:
+                if len(python_files) != 1:
                     raise ValueError(
-                        "Could not find the path to the cubit python interpreter"
+                        "Could not uniquely determine the path to the Cubit Python "
+                        f"interpreter. Expected exactly one 'python3.x' executable "
+                        f"under '{cubit_path}', but found {len(python_files)}: {python_files}"
                     )
-                cubit_python_interpreter = python3_files[0]
-                return cubit_python_interpreter
+                return str(python_files[0])
             else:
                 python2_path_env = get_path(
                     "CUBITPY_PYTHON2", os.path.isfile, throw_error=False

{cubitpy-0.2.2 → cubitpy-0.2.4}/src/cubitpy/cubit_wrapper/cubit_wrapper_host.py

@@ -129,9 +129,16 @@ class CubitConnect(object):
                         stacklevel=3,
                     )
                 if len(return_value["errors"]) > 0:
-                    raise RuntimeError(
-                        get_log_string(return_value["errors"], "error(s)")
-                    )
+                    error_string = get_log_string(return_value["errors"], "error(s)")
+                    if cupy.on_cubit_error == "raise":
+                        raise RuntimeError(error_string)
+                    elif cupy.on_cubit_error == "warn":
+                        warnings.warn(
+                            error_string,
+                            category=CubitPyWarning,
+                            stacklevel=3,
+                        )
+                    # "ignore": silently continue
                 return return_value["return_value"]
             else:
                 return return_value

{cubitpy-0.2.2 → cubitpy-0.2.4}/src/cubitpy/version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.2.2'
-__version_tuple__ = version_tuple = (0, 2, 2)
+__version__ = version = '0.2.4'
+__version_tuple__ = version_tuple = (0, 2, 4)
 
-__commit_id__ = commit_id = 'g4d0bd8df5'
+__commit_id__ = commit_id = 'g6fa66acbd'

{cubitpy-0.2.2 → cubitpy-0.2.4/src/cubitpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cubitpy
-Version: 0.2.2
+Version: 0.2.4
 Summary: CubitPy: Utility functions and 4C related functionality for the Cubit and Coreform python interface
 Author-email: Ivo Steinbrecher <ivo.steinbrecher@unibw.de>
 License-Expression: MIT
@@ -14,7 +14,7 @@ Requires-Dist: numpy
 Requires-Dist: fourcipp
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest<9.2; extra == "dev"
 Requires-Dist: pytest-benchmark; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: deepdiff; extra == "dev"
@@ -95,6 +95,7 @@ remote_config:
   host: "hostname"
   platform: "windows"
   cubit_path: "C:\\Coreform_Cubit_2025.8"
+on_cubit_error: "raise"  # optional: "raise" (default), "warn" or "ignore"
 ```
 To run CubitPy one can either provide the configuration file then initializing CubitPy, or set an environment variable with the path to the configuration file.
 ```bash

{cubitpy-0.2.2 → cubitpy-0.2.4}/src/cubitpy.egg-info/SOURCES.txt

@@ -22,6 +22,8 @@ src/cubitpy.egg-info/PKG-INFO
 src/cubitpy.egg-info/SOURCES.txt
 src/cubitpy.egg-info/dependency_links.txt
 src/cubitpy.egg-info/requires.txt
+src/cubitpy.egg-info/scm_file_list.json
+src/cubitpy.egg-info/scm_version.json
 src/cubitpy.egg-info/top_level.txt
 src/cubitpy/cubit_wrapper/__init__.py
 src/cubitpy/cubit_wrapper/cubit_wrapper_client.py

{cubitpy-0.2.2 → cubitpy-0.2.4}/src/cubitpy.egg-info/requires.txt

@@ -5,7 +5,7 @@ fourcipp
 
 [dev]
 pre-commit
-pytest
+pytest<9.2
 pytest-benchmark
 pytest-cov
 deepdiff

cubitpy-0.2.4/src/cubitpy.egg-info/scm_file_list.json

@@ -0,0 +1,83 @@
+{
+  "files": [
+    ".coveragerc",
+    ".github/workflows/code_checks.yml",
+    ".github/workflows/cubitpy_test_suite_with_secrets.yml",
+    ".gitignore",
+    ".pre-commit-config.yaml",
+    "CONTRIBUTORS",
+    "LICENSE",
+    "README.md",
+    "pyproject.toml",
+    "src/cubitpy/__init__.py",
+    "src/cubitpy/conf.py",
+    "src/cubitpy/cubit_group.py",
+    "src/cubitpy/cubit_to_fourc_input.py",
+    "src/cubitpy/cubit_utility.py",
+    "src/cubitpy/cubit_wrapper/__init__.py",
+    "src/cubitpy/cubit_wrapper/cubit_wrapper_client.py",
+    "src/cubitpy/cubit_wrapper/cubit_wrapper_file_transfer.py",
+    "src/cubitpy/cubit_wrapper/cubit_wrapper_host.py",
+    "src/cubitpy/cubit_wrapper/cubit_wrapper_utility.py",
+    "src/cubitpy/cubitpy.py",
+    "src/cubitpy/cubitpy_types.py",
+    "src/cubitpy/exodus_utility.py",
+    "src/cubitpy/geometry_creation_functions.py",
+    "src/cubitpy/mesh_creation_functions.py",
+    "src/tutorial/__init__.py",
+    "src/tutorial/tutorial.py",
+    "tests/coverage.config",
+    "tests/external-geometry/fluent_aneurysm.msh",
+    "tests/input-files-ref/test_block_function.4C.yaml",
+    "tests/input-files-ref/test_contact_condition_beam_to_surface.4C.yaml",
+    "tests/input-files-ref/test_contact_condition_curve_to_curve.4C.yaml",
+    "tests/input-files-ref/test_contact_condition_surface_to_surface.4C.yaml",
+    "tests/input-files-ref/test_create_block.4C.yaml",
+    "tests/input-files-ref/test_create_block_unaltered_element_dict.4C.yaml",
+    "tests/input-files-ref/test_create_block_unaltered_element_dict_exo.4C.yaml",
+    "tests/input-files-ref/test_create_block_unaltered_element_dict_exo.exo",
+    "tests/input-files-ref/test_create_brick_by_corner_points.4C.yaml",
+    "tests/input-files-ref/test_create_wedge6.4C.yaml",
+    "tests/input-files-ref/test_cubit_tutorial_coreform.4C.yaml",
+    "tests/input-files-ref/test_cubit_tutorial_cubit15.4C.yaml",
+    "tests/input-files-ref/test_dump_numpy_array.4C.yaml",
+    "tests/input-files-ref/test_element_types_hex.4C.yaml",
+    "tests/input-files-ref/test_element_types_quad_yplane.4C.yaml",
+    "tests/input-files-ref/test_element_types_quad_zplane.4C.yaml",
+    "tests/input-files-ref/test_element_types_tet_coreform.4C.yaml",
+    "tests/input-files-ref/test_element_types_tet_cubit15.4C.yaml",
+    "tests/input-files-ref/test_element_types_tet_single_element_with_exo.4C.yaml",
+    "tests/input-files-ref/test_element_types_tet_single_element_with_exo.exo",
+    "tests/input-files-ref/test_element_types_tet_single_element_without_exo.4C.yaml",
+    "tests/input-files-ref/test_extrude_mesh_function.4C.yaml",
+    "tests/input-files-ref/test_extrude_mesh_function_average_normals_block.4C.yaml",
+    "tests/input-files-ref/test_extrude_mesh_function_average_normals_for_cylinder_and_sphere.4C.yaml",
+    "tests/input-files-ref/test_fluid_functionality_coreform.4C.yaml",
+    "tests/input-files-ref/test_fluid_functionality_cubit15.4C.yaml",
+    "tests/input-files-ref/test_fsi_functionality.4C.yaml",
+    "tests/input-files-ref/test_group_of_surfaces.4C.yaml",
+    "tests/input-files-ref/test_groups.4C.yaml",
+    "tests/input-files-ref/test_groups_multiple_sets.4C.yaml",
+    "tests/input-files-ref/test_mesh_import.4C.yaml",
+    "tests/input-files-ref/test_node_set_geometry_type.4C.yaml",
+    "tests/input-files-ref/test_node_sets_without_boundary_condition_with_exo.4C.yaml",
+    "tests/input-files-ref/test_node_sets_without_boundary_condition_with_exo.exo",
+    "tests/input-files-ref/test_node_sets_without_boundary_condition_without_exo.4C.yaml",
+    "tests/input-files-ref/test_point_coupling.4C.yaml",
+    "tests/input-files-ref/test_reset_block_1.4C.yaml",
+    "tests/input-files-ref/test_reset_block_2.4C.yaml",
+    "tests/input-files-ref/test_scatra_functionality.4C.yaml",
+    "tests/input-files-ref/test_serialize_nested_lists.4C.yaml",
+    "tests/input-files-ref/test_thermo_functionality.4C.yaml",
+    "tests/input-files-ref/test_user_defined_node_set_and_block_ids_with_exo.4C.yaml",
+    "tests/input-files-ref/test_user_defined_node_set_and_block_ids_with_exo.exo",
+    "tests/input-files-ref/test_user_defined_node_set_and_block_ids_without_exo.4C.yaml",
+    "tests/input-files-ref/test_yaml_with_exo_export_fsi.4C.yaml",
+    "tests/input-files-ref/test_yaml_with_exo_export_fsi.exo",
+    "tests/run_delete_test.py",
+    "tests/test_configurations.sh",
+    "tests/test_cubitpy.py",
+    "tests/test_cubitpy_performance.py",
+    "tests/test_tutorial.py"
+  ]
+}

cubitpy-0.2.4/src/cubitpy.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.2.4",
+  "distance": 0,
+  "node": "g6fa66acbdf38eec28ecddfa5de87049c463dd7f3",
+  "dirty": false,
+  "branch": "main",
+  "node_date": "2026-10-28"
+}

{cubitpy-0.2.2 → cubitpy-0.2.4}/tests/test_cubitpy.py

@@ -2561,3 +2561,34 @@ def test_exodus_to_dict():
     }
 
     compare_nested_dicts_or_lists(exo_dict, reference_exo_dict)
+
+
+def test_on_cubit_error_config(tmp_path):
+    """The optional 'on_cubit_error' config key sets the error reaction."""
+
+    def write_config(extra=""):
+        """Write a minimal remote config, optionally with an extra line."""
+        path = tmp_path / "cubitpy_config.yaml"
+        path.write_text(
+            'cubitpy_mode: "remote"\n'
+            f"{extra}"
+            "remote_config:\n"
+            '  user: "user"\n'
+            '  host: "host"\n'
+            '  platform: "linux"\n'
+            '  cubit_path: "/cubit"\n'
+        )
+        return path
+
+    saved_config = cupy._config
+    try:
+        cupy.load_cubit_config(write_config())
+        assert cupy.on_cubit_error == "raise"  # default when the key is absent
+
+        cupy.load_cubit_config(write_config('on_cubit_error: "warn"\n'))
+        assert cupy.on_cubit_error == "warn"
+
+        with pytest.raises(RuntimeError, match="Invalid on_cubit_error"):
+            cupy.load_cubit_config(write_config('on_cubit_error: "bogus"\n'))
+    finally:
+        cupy._config = saved_config