sxs 2025.0.17__tar.gz → 2025.0.19__tar.gz

{sxs-2025.0.17 → sxs-2025.0.19}/.github/workflows/build.yml

@@ -52,7 +52,7 @@ jobs:
         if: ${{ env.skipping_build_and_test_replicate != 'true' }}
         uses: actions/cache@v4
         with:
-          key: sxs-${{ runner.os }}-2 # Increment this number whenever the cached files should change
+          key: sxs-${{ runner.os }}-3 # 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' }}
 
@@ -68,11 +68,11 @@ jobs:
 
       - name: Check out code
         if: ${{ env.skipping_build_and_test_replicate != 'true' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Python ${{ matrix.python-version }}
         if: ${{ env.skipping_build_and_test_replicate != 'true' }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -83,6 +83,8 @@ jobs:
       - name: Run tests
         if: ${{ env.skipping_build_and_test_replicate != 'true' }}
         shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           hatch run test --durations=0
 
@@ -105,10 +107,10 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.13'
 

{sxs-2025.0.17 → sxs-2025.0.19}/CITATION.cff

@@ -16,5 +16,5 @@ authors:
 title: "The sxs package"
 license: MIT
 doi: 10.5281/zenodo.4034006
-version: 2025.0.17
-date-released: 2025-06-11
+version: 2025.0.19
+date-released: 2025-09-08

{sxs-2025.0.17 → sxs-2025.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sxs
-Version: 2025.0.17
+Version: 2025.0.19
 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-2025.0.19/sxs/__version__.py

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

{sxs-2025.0.17 → sxs-2025.0.19}/sxs/catalog/catalog.py

@@ -6,7 +6,7 @@ import functools
 # noinspection SpellCheckingInspection
 class Catalog(object):
     """Container interface to the SXS catalog"""
-    url = "https://data.black-holes.org/catalog.json"
+    url = "https://data.black-holes.org/catalog.zip"
 
     def __init__(self, catalog=None, **kwargs):
         from .. import Metadata
@@ -60,6 +60,9 @@ class Catalog(object):
         which, as of `sxs` version 2024.0.0, has been deprecated in
         favor of the `Simulations` interface.  See the documentation
         for more information.
+
+        THIS CAN ONLY PROVIDE OLD DATA!
+
         """
         warn(deprecation_notice)
 
@@ -73,36 +76,12 @@ class Catalog(object):
             if_newer = False
 
         if download or download is None:
-            # 1. Download the full json file (zipped in flight, but auto-decompressed on arrival)
-            # 2. Zip to a temporary file (using bzip2, which is better than the in-flight compression)
-            # 3. Replace the original catalog.zip with the temporary zip file
-            # 4. Remove the full json file
-            # 5. Make sure the temporary zip file is gone too
-            temp_json = cache_path.with_suffix(".temp.json")
-            temp_zip = cache_path.with_suffix(".temp.zip")
             try:
-                try:
-                    download_file(cls.url, temp_json, progress=progress, if_newer=if_newer)
-                except Exception as e:
-                    if download:
-                        raise RuntimeError(f"Failed to download '{cls.url}'; try setting `download=False`") from e
-                    download_failed = e  # We'll try the cache
-                else:
-                    download_failed = False
-                    if temp_json.exists():
-                        with zipfile.ZipFile(temp_zip, "w", compression=zipfile.ZIP_BZIP2) as catalog_zip:
-                            catalog_zip.write(temp_json, arcname="catalog.json")
-                        temp_zip.replace(cache_path)
-            finally:
-                # The `missing_ok` argument to `unlink` would be much nicer, but was added in python 3.8
-                try:
-                    temp_json.unlink()
-                except FileNotFoundError as e:
-                    pass
-                try:
-                    temp_zip.unlink()
-                except FileNotFoundError as e:
-                    pass
+                download_file(cls.url, cache_path, progress=progress, if_newer=if_newer)
+            except Exception as e:
+                if download:
+                    raise RuntimeError(f"Failed to download '{cls.url}'; try setting `download=False`") from e
+                download_failed = e  # We'll try the cache
 
         if not cache_path.exists():
             if download is False:  # Test if it literally *is* False, rather than just casts to False

{sxs-2025.0.17 → sxs-2025.0.19}/tests/conftest.py

@@ -1,4 +1,5 @@
 import os
+import time
 import functools
 import pytest
 import numpy as np
@@ -36,7 +37,6 @@ if GITHUB_ACTIONS_MACOS:
 else:
     skip_macOS_GH_actions_downloads = lambda f: f
 
-
 def pytest_addoption(parser):
     parser.addoption("--ell_max", action="store", type=int, default=ell_max_default,
                      help="Maximum ell value to test")

sxs-2025.0.17/sxs/__version__.py

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