sxs 2024.0.6__py3-none-any.whl → 2024.0.7__py3-none-any.whl

sxs/__version__.py

@@ -1 +1 @@
-__version__ = "2024.0.6"
+__version__ = "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/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/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/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/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.dist-info → sxs-2024.0.7.dist-info}/METADATA

@@ -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.6.dist-info → sxs-2024.0.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 sxs/__init__.py,sha256=51_F8xiD6cdE2kIq9dPyHxNQVsp4oCvtR1wQQQ0VS2A,2577
-sxs/__version__.py,sha256=YFK3IT8GG2d3hDuZZ42G2jgH-IxsrF_xK1YVnywr2M4,25
-sxs/handlers.py,sha256=F9XmIhjZm8df1g49fUHemc-9wWstwFUZMacY2RXCWhE,24814
+sxs/__version__.py,sha256=j01pd3i6foxRb99xUCzpe724QNlPfN7SMCX-DnRdfAc,25
+sxs/handlers.py,sha256=mEPkqvFmmt-kfX8fLhwhozrgh7RxnUIX3-UcswtIBNw,24896
 sxs/juliapkg.json,sha256=higH1UDu30K_PN6-o7lAz0j1xjgYEiCCYBAc-Iaw1Iw,178
 sxs/time_series.py,sha256=OKaLg8tFyrtKcef7900ri-a0C6A8wKxA68KovZXvH6I,41081
 sxs/caltechdata/__init__.py,sha256=s-RXyBiImKsQenqJIU6NAjlsjOX7f1MkIIW9rPtWYyg,14761
@@ -16,10 +16,10 @@ sxs/horizons/xor_multishuffle_bzip2.py,sha256=y4AKuxmLuj8K1pkdhIoSzENGyMu4uhpiPr
 sxs/julia/GWFrames.py,sha256=47H9Ugff7ldGBujiUTcADT3b4MSxUtqmajvSApI91WA,2892
 sxs/julia/__init__.py,sha256=uSLP_xfU-GZG7IO5vs0TEkCR4LH8aBYMF-852wDY3kI,3490
 sxs/metadata/__init__.py,sha256=KCvJ9Cf1WhIZp-z28UzarKcmUAzV2BOv2gqKiorILjo,149
-sxs/metadata/metadata.py,sha256=_vGqMUbeiN0fecJj9f9f9ex56WgSZuwwBXykUuj1_ZI,27679
+sxs/metadata/metadata.py,sha256=y6X7LcsJKiZFjBPTwRHGtsT2uHf2s0r0OG_EGjD27pE,27663
 sxs/simulations/__init__.py,sha256=sl-sDI5N2A03lAfzMig8Jm_Beri_v65qjlIOeGGX9XM,72
-sxs/simulations/simulation.py,sha256=8eGMyKIBJD45uo8Gb6fhhF5mHnp03cGu5SzAb-4wfS4,22884
-sxs/simulations/simulations.py,sha256=G4w_zed15g-b_4wLnt5sRmVPo2XxDq6XAW8EnlreX9E,16953
+sxs/simulations/simulation.py,sha256=uHp36DfMsh3o_8hUJK-D_tl4LnunL9YfRUTZGjOkcIs,23049
+sxs/simulations/simulations.py,sha256=a-L9xDYNySw2DO5vf5gtRFNr4UrEvIvf9BeqpnIbdLU,17013
 sxs/utilities/__init__.py,sha256=YTyrKYkiDZV4EoT4IHXGBsc_j6RU0aK1c3HERyshVq0,4760
 sxs/utilities/bitwise.py,sha256=G9ZNYgwDQRhq5wbDf-p2HcUqkEP_IRDiQoXW4KyU17k,13205
 sxs/utilities/dicts.py,sha256=CCpm3upG_9SRj9gjawukSUfaJ5asF-XRG2ausEXhYyg,695
@@ -66,7 +66,7 @@ sxs/waveforms/waveform_signal.py,sha256=Ojrt6DSDdleB0qmu6UwjjPnYdaWsrjnpBA_8dhnM
 sxs/waveforms/format_handlers/__init__.py,sha256=0wsnuBYCYsCkN19L2ipga7BtigvPyBcqiy_4qrzmLpE,50
 sxs/waveforms/format_handlers/lvc.py,sha256=kUiLT-QbBTH5Di2touWwXqasQ8Q777mV9zhRIHEqjPk,7789
 sxs/waveforms/format_handlers/nrar.py,sha256=2gQby7NwfagXCCllzVsxsc_cRbtdIWVvvwF4GOLvtLQ,20431
-sxs/waveforms/format_handlers/rotating_paired_diff_multishuffle_bzip2.py,sha256=ixxAntHxxDEP_NJJ9vSwptwIHBBZRcFq00k9WcOeOug,27676
+sxs/waveforms/format_handlers/rotating_paired_diff_multishuffle_bzip2.py,sha256=C19-9VkQ5dt9I7GHkeFrF56k_BbFPHXIMX_xmmBj7ww,27477
 sxs/waveforms/format_handlers/rotating_paired_xor_multishuffle_bzip2.py,sha256=pFEJIlb6OQQNhv6r48ALFnZMKNZjuQY55ydWBADCDgU,2348
 sxs/waveforms/format_handlers/spectre_cce_v1.py,sha256=nh57zbG_uWJZQVhMrz7H05fpsjl1X6oaita8aTRcWxU,3963
 sxs/zenodo/__init__.py,sha256=KDcCWb7E3frZ0VylKFUkgeEMra6RG1q6FFy5Na8UuLY,26224
@@ -78,7 +78,7 @@ sxs/zenodo/api/__init__.py,sha256=EM_eh4Q8R5E0vIfMhyIR1IYFfOBu6vA0UTasgX9gHys,21
 sxs/zenodo/api/deposit.py,sha256=J4RGvGjh0cEOrN4bBZWEDcPAhNscqB2fzLlvRZ5HTHM,36948
 sxs/zenodo/api/login.py,sha256=Yz0ytgi81_5BpDzhrS0WPMXlvU2qUaCK8yn8zxfEbko,18007
 sxs/zenodo/api/records.py,sha256=nKkhoHZ95CTztHF9Zzaug5p7IiUCJG4Em1i-l-WqH6U,3689
-sxs-2024.0.6.dist-info/METADATA,sha256=0W1NSgRu9H9pxeMYebBBB1fNjBhCzNe5aFZw4ngYi1o,9301
-sxs-2024.0.6.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-sxs-2024.0.6.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
-sxs-2024.0.6.dist-info/RECORD,,
+sxs-2024.0.7.dist-info/METADATA,sha256=QhRUbtPaWuv0iFgPc2yfCcrW1iXYgCnulp6DiMJkcoU,9301
+sxs-2024.0.7.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+sxs-2024.0.7.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
+sxs-2024.0.7.dist-info/RECORD,,