sxs 2024.0.6__tar.gz → 2024.0.7__tar.gz

{sxs-2024.0.6 → sxs-2024.0.7}/CITATION.cff

@@ -10,5 +10,5 @@ authors:
 title: "The sxs package"
 license: MIT
 doi: 10.5281/zenodo.4034006
-version: 2024.0.6
-date-released: 2024-09-05
+version: 2024.0.7
+date-released: 2024-09-06

{sxs-2024.0.6 → sxs-2024.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sxs
-Version: 2024.0.6
+Version: 2024.0.7
 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/

sxs-2024.0.7/sxs/__version__.py

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

{sxs-2024.0.6 → sxs-2024.0.7}/sxs/handlers.py

@@ -282,7 +282,7 @@ def load(location, download=None, cache=None, progress=None, truepath=None, **kw
 
         elif location == "simulations":
             return Simulations.load(download=download)
-        
+
         elif sxs_id_version_lev_exact_re.match(location):
             return Simulation(location, download=download, cache=cache, progress=progress, **kwargs)
 
@@ -311,7 +311,12 @@ def load(location, download=None, cache=None, progress=None, truepath=None, **kw
 
     loader = sxs_loader(path, kwargs.get("group", None))
 
-    return loader(path, **kwargs)
+    loaded = loader(path, **kwargs)
+    try:
+        loaded.__file__ = str(path)
+    except:
+        pass
+    return loaded
 
 
 def load_via_sxs_id(sxsid, location, *, download=None, cache=None, progress=None, truepath=None, **kwargs):

{sxs-2024.0.6 → sxs-2024.0.7}/sxs/metadata/metadata.py

@@ -90,7 +90,7 @@ class Metadata(collections.OrderedDict):
                 else:
                     return cls.from_json_file(json_path)
             else:
-                raise ValueError(f"Could not find file named '{file_name}', '{json_path}', or '{txt_path}'")
+                raise ValueError(f"Could not find file named '{json_path}' or '{txt_path}'")
 
     load = from_file
 

{sxs-2024.0.6 → sxs-2024.0.7}/sxs/simulations/simulation.py

@@ -95,7 +95,8 @@ def Simulation(location, *args, **kwargs):
     arguments other than those listed above.
     
     """
-    from .. import load
+    from .. import load, sxs_directory
+    from ..utilities import sxs_path_to_system_path
 
     # Extract the simulation ID, version, and Lev from the location string
     simulation_id, input_version = sxs_id_and_version(location)
@@ -202,15 +203,17 @@ def Simulation(location, *args, **kwargs):
     # Finally, figure out which version of the simulation to load and dispatch
     version_number = float(version[1:])
     if 1 <= version_number < 2.0:
-        return Simulation_v1(
+        sim = Simulation_v1(
             metadata, series, version, sxs_id_stem, sxs_id, url, files, lev_numbers, output_lev_number, location, *args, **kwargs
         )
     elif 2 <= version_number < 3.0:
-        return Simulation_v2(
+        sim = Simulation_v2(
             metadata, series, version, sxs_id_stem, sxs_id, url, files, lev_numbers, output_lev_number, location, *args, **kwargs
         )
     else:
         raise ValueError(f"Version '{version}' not yet supported")
+    sim.__file__ = str(sxs_directory("cache") / sxs_path_to_system_path(sim.sxs_id))
+    return sim
 
 
 class SimulationBase:

{sxs-2024.0.6 → sxs-2024.0.7}/sxs/simulations/simulations.py

@@ -157,7 +157,9 @@ class Simulations(collections.OrderedDict):
         except Exception as e:
             raise ValueError(f"Failed to open '{cache_path}' as a ZIP file") from e
 
-        return cls(simulations)
+        sims = cls(simulations)
+        sims.__file__ = str(cache_path)
+        return sims
 
     @classmethod
     def reload(cls, download=True):

{sxs-2024.0.6 → sxs-2024.0.7}/sxs/waveforms/format_handlers/rotating_paired_diff_multishuffle_bzip2.py

@@ -435,7 +435,7 @@ def load(
     # This means we need to change the suffix *before* the resolve() call.
     h5_path = pathlib.Path(file_name_str).with_suffix(".h5").expanduser().resolve()
     json_path = pathlib.Path(file_name_str).with_suffix(".json").expanduser().resolve()
-    metadata_path = (pathlib.Path(file_name_str).parent / "metadata.json").expanduser().resolve()
+    metadata_path = (pathlib.Path(file_name_str).parent / "metadata").expanduser().resolve()
 
     # This will be used for validation
     h5_size = h5_path.stat().st_size
@@ -571,12 +571,10 @@ def load(
         w = w.to_inertial_frame()
 
     if metadata is None:
-        if metadata_path.exists():
+        try:
             metadata = Metadata.from_file(metadata_path)
-        elif metadata_path.with_suffix(".txt").exists():
-            metadata = Metadata.from_file(metadata_path.with_suffix(".txt"))
-        else:
-            invalid(f"\nMetadata files {metadata_path}/.txt cannot be found, but at least one is expected for this data format.")
+        except ValueError as e:
+            invalid(f"\n{e},\nbut one is expected for this data format.")
 
     dtb = kwargs.pop("drop_times_before", 0)
     if dtb=="begin":

sxs-2024.0.6/sxs/__version__.py

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