Merge pull request #575 from 3dgeo-heidelberg/fix-global-settings

Fix global settings
3dgeo-heidelberg · Feb 28, 2025 · bb85bdd · bb85bdd
2 parents e5849e2 + 91b38cb
commit bb85bdd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/python/helios/settings.py b/python/helios/settings.py
@@ -140,7 +140,7 @@ def _compose_settings(*settings, **parameters):
     # Find the most specialized base settings class
     for base in settings:
         if base is not None:
-            result = base
+            result = base.clone()
             break
 
     # There should always be one base settings class, because the

diff --git a/tests/python/conftest.py b/tests/python/conftest.py
@@ -26,14 +26,10 @@ def rng_seed():
     set_rng_seed(42)
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 def reset_global_state():
     """Reset global state after a test alters it"""
 
-    # NB: This fixture being autouse=True is a stop-gap measure until we
-    #     implemented clone behaviour for all model objects, so that we
-    #     avoid accidentally editing the global state.
-
     yield
 
     set_execution_settings(ExecutionSettings())