sxs 2025.0.3__tar.gz → 2025.0.5__tar.gz

{sxs-2025.0.3 → sxs-2025.0.5}/CITATION.cff

@@ -10,5 +10,5 @@ authors:
 title: "The sxs package"
 license: MIT
 doi: 10.5281/zenodo.4034006
-version: 2025.0.3
-date-released: 2025-04-10
+version: 2025.0.5
+date-released: 2025-04-11

{sxs-2025.0.3 → sxs-2025.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sxs
-Version: 2025.0.3
+Version: 2025.0.5
 Summary: Interface to data produced by the Simulating eXtreme Spacetimes collaboration
 Project-URL: Homepage, https://github.com/sxs-collaboration/sxs
 Project-URL: Documentation, https://sxs.readthedocs.io/
@@ -47,7 +47,7 @@ Requires-Dist: quaternionic>=1.0.15
 Requires-Dist: requests>=2.24.0
 Requires-Dist: scipy>=1.13
 Requires-Dist: spherical>=1.0.15
-Requires-Dist: sxscatalog>=3.0.0a26
+Requires-Dist: sxscatalog>=3.0.12
 Requires-Dist: tqdm>=4.63.1
 Requires-Dist: urllib3>=1.25.10
 Provides-Extra: docs

{sxs-2025.0.3 → sxs-2025.0.5}/pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
   "Topic :: Scientific/Engineering :: Astronomy"
 ]
 dependencies = [
-  "sxscatalog >=3.0.0a26",
+  "sxscatalog >=3.0.12",
   "numpy >=1.25",
   "scipy >=1.13",
   "numba >=0.55; implementation_name == 'cpython'",

sxs-2025.0.5/sxs/__version__.py

@@ -0,0 +1 @@
+__version__ = "2025.0.5"

{sxs-2025.0.3 → sxs-2025.0.5}/sxs/simulations/simulation.py

@@ -924,18 +924,33 @@ class Simulation_v3(Simulation_v2):
 
 
 def get_file_info(metadata, sxs_id, download=None):
-    # TODO: Allow an existing zenodo_metadata.json file to be used
-    from .. import load_via_sxs_id
+    from .. import load, load_via_sxs_id
     if "files" in metadata:
         return metadata["files"]
     truepath = Path(sxs_path_to_system_path(sxs_id)) / "zenodo_metadata.json"
     record = load_via_sxs_id(sxs_id, "export/json", truepath=truepath, download=download)
-    entries = record["files"]["entries"]
-    return {
-        str(filename): {
-            "checksum": entry["checksum"],
-            "size": entry["size"],
-            "link": entry["links"]["content"],
+    if not record.get("files", {}).get("entries", []):
+        # CaltechDATA files should generally be already stored in the `simulations`,
+        # but just in case, we get to this point
+        truepath = Path(sxs_path_to_system_path(sxs_id)) / "caltechdata_files.json"
+        url = record["links"]["files"]
+        record = load(url, truepath=truepath, download=download)
+        entries = record["entries"]
+        return {
+            entry["key"]: {
+                "checksum": entry["checksum"],
+                "size": entry["size"],
+                "link": entry["links"]["content"],
+            }
+            for entry in entries
+        }
+    else:
+        entries = record["files"]["entries"]
+        return {
+            str(filename): {
+                "checksum": entry["checksum"],
+                "size": entry["size"],
+                "link": entry["links"]["content"],
+            }
+            for filename, entry in entries.items()
         }
-        for filename, entry in entries.items()
-    }

{sxs-2025.0.3 → sxs-2025.0.5}/tests/test_simulation.py

@@ -49,6 +49,51 @@ def test_sxs_load_v2_levs():
         s.Horizons
 
 
+@skip_macOS_GH_actions_downloads
+def test_sxs_load_v3():
+    # # This is necessary only after the deprecation of SXS:BBH:4000v3.0
+    # with pytest.warns(UserWarning):
+    #     s = sxs.load("SXS:BBH:4000v3.0")
+    s = sxs.load("SXS:BBH:4000v3.0")
+    assert s.sxs_id_stem == "SXS:BBH:4000"
+    assert s.version == "v3.0"
+    s.h
+    s.strain
+    s.H
+    s.Strain
+    s.horizons
+    s.Horizons
+    s.psi4
+    s.Psi4
+
+
+@skip_macOS_GH_actions_downloads
+def test_sxs_load_v3_levs():
+    # Check that a bad Lev raises an error
+    with pytest.raises(ValueError):
+        sxs.load("SXS:BBH:4000v3.0/Lev189", ignore_deprecation=True)
+    # Check that the default Lev works, and different Levs produce different metadata
+    assert (
+        sxs.load("SXS:BBH:4000v3.0").metadata.reference_time
+        == sxs.load("SXS:BBH:4000v3.0/Lev3").metadata.reference_time
+    )
+    assert (
+        sxs.load("SXS:BBH:4000v3.0/Lev1").metadata.reference_time
+        != sxs.load("SXS:BBH:4000v3.0/Lev3").metadata.reference_time
+    )
+    for lev, lev_number in [("", 3), ("/Lev3", 3), ("/Lev2", 2), ("/Lev1", 1)]:
+        s = sxs.load(f"SXS:BBH:4000v3.0{lev}", ignore_deprecation=True)
+        assert s.sxs_id_stem == "SXS:BBH:4000"
+        assert s.version == "v3.0"
+        assert s.lev_number == lev_number
+        s.h
+        s.strain
+        s.H
+        s.Strain
+        s.horizons
+        s.Horizons
+
+
 @skip_macOS_GH_actions_downloads
 @pytest.mark.parametrize("loader", [sxs.Simulation, sxs.load])
 def test_superseding(loader):

sxs-2025.0.3/sxs/__version__.py

@@ -1 +0,0 @@
-__version__ = "2025.0.3"