sxs 2025.0.1__tar.gz → 2025.0.2__tar.gz

{sxs-2025.0.1 → sxs-2025.0.2}/.github/workflows/build.yml

@@ -47,7 +47,7 @@ jobs:
         if: ${{ env.skipping_build_and_test_replicate != 'true' }}
         uses: actions/cache@v4
         with:
-          key: sxs-${{ runner.os }}-1 # Increment this number whenever the cached files should change
+          key: sxs-${{ runner.os }}-2 # Increment this number whenever the cached files should change
           path: |
             ${{ runner.os == 'Linux' && '/home/runner/.cache/sxs' || runner.os == 'Windows' && 'C:\Users\runneradmin\.sxs\cache' || '/Users/runner/.sxs/cache' }}
 

{sxs-2025.0.1 → sxs-2025.0.2}/CITATION.cff

@@ -10,5 +10,5 @@ authors:
 title: "The sxs package"
 license: MIT
 doi: 10.5281/zenodo.4034006
-version: 2025.0.1
-date-released: 2025-03-19
+version: 2025.0.2
+date-released: 2025-03-26

{sxs-2025.0.1 → sxs-2025.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sxs
-Version: 2025.0.1
+Version: 2025.0.2
 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/
@@ -46,7 +46,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.0a1
+Requires-Dist: sxscatalog>=3.0.0a26
 Requires-Dist: tqdm>=4.63.1
 Requires-Dist: urllib3>=1.25.10
 Provides-Extra: docs

{sxs-2025.0.1 → sxs-2025.0.2}/pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
   "Topic :: Scientific/Engineering :: Astronomy"
 ]
 dependencies = [
-  "sxscatalog >=3.0.0a1",
+  "sxscatalog >=3.0.0a26",
   "numpy >=1.25",
   "scipy >=1.13",
   "numba >=0.55; implementation_name == 'cpython'",
@@ -73,6 +73,7 @@ path = "sxs/__version__.py"
 
 [tool.hatch.envs.default]
 dependencies = [
+  "ipython",
   "pytest",
   "pytest-cov",
   "pytest-forked >=1.3.0",

sxs-2025.0.2/sxs/__version__.py

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

{sxs-2025.0.1 → sxs-2025.0.2}/sxs/handlers.py

@@ -237,7 +237,7 @@ def load(location, download=None, cache=None, progress=None, truepath=None, **kw
     import pathlib
     import urllib.request
     from . import Simulations, Simulation, read_config, sxs_directory, Catalog
-    from .utilities import url, download_file, sxs_path_to_system_path, sxs_id_version_lev_exact_re, lev_path_re
+    from .utilities import url, download_file, sxs_path_to_system_path, sxs_id_version_lev_exact_re, lev_path_re, sxs_identifier_re
 
     # Note: `download` and/or `cache` may still be `None` after this
     if download is None:
@@ -294,11 +294,30 @@ def load(location, download=None, cache=None, progress=None, truepath=None, **kw
                 local=kwargs.get("local", False),
                 annex_dir=kwargs.get("annex_dir", None)
             )
+            # If we chop off any "/LevN", and it's in the simulations, load it as a simulation
             if lev_path_re.sub("", location) in simulations:
                 return Simulation(
                     location, download=download, cache=cache, progress=progress, **kwargs
                 )
 
+            # Now we look for a file in `simulations`
+            if sxs_identifier_re.match(location):
+                split_location = sxs_identifier_re.split(location)
+                # Currently we can only handle unversioned SXS ID files
+                if split_location[5] is None:
+                    sxs_id = split_location[1]
+                    file = split_location[-1].lstrip("/").lstrip("\\")
+                    if sxs_id in simulations:
+                        simulation = simulations[sxs_id]
+                        if "files" in simulation:
+                            file_info = simulation["files"][file]
+                            location = file_info["link"]
+                            truepath = truepath or (pathlib.Path(sxs_id) / file)
+                            return load(
+                                location, truepath=truepath,
+                                download=download, cache=cache, progress=progress, **kwargs
+                            )
+
             # Try to find an appropriate SXS file in the catalog
             catalog = Catalog.load(download=download)
             selections = catalog.select_files(location)

{sxs-2025.0.1 → sxs-2025.0.2}/sxs/waveforms/format_handlers/lvc.py

@@ -36,11 +36,12 @@ def to_lvc_conventions(
 ):
     r"""Return SXS waveform in LVC conventions.
 
-    This is the function underpinning `sxs.load_lvc`.  Essentially,
-    that function is a fairly thin wrapper around this one; it just
-    loads the `h` and `horizons` data and passes it to this function.
-    For explanation of what this function does, the inputs, and
-    outputs, see that function's docstring.
+    This is the function underpinning the `to_lvk` method of the
+    various `Simulation` types.  Essentially, that function is a
+    fairly thin wrapper around this one; it just loads the `h` and
+    `horizons` data and passes it to this function.  For explanation
+    of what this function does, the inputs, and outputs, see that
+    function's docstring.
 
     """
     if t_ref is None and f_ref is None:

{sxs-2025.0.1 → sxs-2025.0.2}/sxs/waveforms/format_handlers/rotating_paired_diff_multishuffle_bzip2.py

@@ -413,6 +413,12 @@ def load(
             raise ValueError(message)
 
     file_name_str = str(file_name)
+    if file_name_str.endswith(".json"):
+        # This is just a JSON file with the "sxs_format" key, not an H5 file
+        # with the data in it.  Just return the JSON data.
+        from ...handlers import JSONHandler
+        return JSONHandler.load(file_name_str)
+
     group = kwargs.get("group", None)
     if ".h5" in file_name_str and not file_name_str.endswith(".h5"):
         file_name_str, group = file_name_str.split(".h5")

{sxs-2025.0.1 → sxs-2025.0.2}/tests/conftest.py

@@ -29,7 +29,7 @@ GITHUB_ACTIONS_MACOS = (
 # will work adequately.  Note that if macos tests are failing, it may be
 # time to increment the cache version number in .github/workflows/build.yml;
 # try that before re-enabling this decorator.
-if False: # GITHUB_ACTIONS_MACOS:
+if GITHUB_ACTIONS_MACOS:
     skip_macOS_GH_actions_downloads = pytest.mark.skip(
         reason="macOS runners on GitHub Actions have connectivity problems"
     )

sxs-2025.0.1/sxs/__version__.py

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