Fix utils tests, fallback version

AstarVienna · Jan 31, 2024 · 7ba4334 · 7ba4334
1 parent d266d00
commit 7ba4334
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/scopesim/__init__.py b/scopesim/__init__.py
@@ -65,5 +65,5 @@
 
 try:
     __version__ = metadata.version(__package__)
-except:
-    version = 0.8
+except metadata.PackageNotFoundError:
+    __version__ = "undetermined"
diff --git a/scopesim/tests/test_utils_functions.py b/scopesim/tests/test_utils_functions.py
@@ -186,29 +186,23 @@ def test_converts_dict(self):
         assert utils.from_currsys({"seed": "!SIM.random.seed"})["seed"] is None
 
     def test_converts_layered_bang_strings(self):
-        old = rc.__currsys__["!SIM.sub_pixel.flag"]
-        rc.__currsys__["!SIM.sub_pixel.flag"] = "!SIM.sub_pixel.fraction"
-
-        result = utils.from_currsys("!SIM.sub_pixel.flag")
-        assert not isinstance(result, str)
-        assert result == 1
-
-        rc.__currsys__["!SIM.sub_pixel.flag"] = old
+        patched = {"!SIM.sub_pixel.flag": "!SIM.sub_pixel.fraction"}
+        with patch.dict("scopesim.rc.__currsys__", patched):
+            result = utils.from_currsys("!SIM.sub_pixel.flag")
+            assert not isinstance(result, str)
+            assert result == 1
 
     def test_converts_astropy_table(self):
         tbl = Table(data=[["!SIM.random.seed"]*2, ["!SIM.random.seed"]*2],
                     names=["seeds", "seeds2"])
         assert utils.from_currsys(tbl["seeds2"][1]) is None
 
     def test_converts_string_numericals_to_floats(self):
-        old = rc.__currsys__["!SIM.sub_pixel.fraction"]
-        rc.__currsys__["!SIM.sub_pixel.fraction"] = "1e0"
-
-        result = utils.from_currsys("!SIM.sub_pixel.fraction")
-        assert isinstance(result, float)
-        assert result == 1
-
-        rc.__currsys__["!SIM.sub_pixel.flag"] = old
+        patched = {"!SIM.sub_pixel.fraction": "1e0"}
+        with patch.dict("scopesim.rc.__currsys__", patched):
+            result = utils.from_currsys("!SIM.sub_pixel.fraction")
+            assert isinstance(result, float)
+            assert result == 1
 
 
 # load_example_optical_train modifies __currsys__!