sxs 2024.0.44__py3-none-any.whl → 2024.0.45__py3-none-any.whl

sxs/__version__.py

@@ -1 +1 @@
-__version__ = "2024.0.44"
+__version__ = "2024.0.45"

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-2024.0.44.dist-info → sxs-2024.0.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sxs
-Version: 2024.0.44
+Version: 2024.0.45
 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.44.dist-info → sxs-2024.0.45.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sxs/__init__.py,sha256=hbydsXWR88sFiKExPJ1NHWGEvWRbbJBjSc1irSMYKgY,2623
-sxs/__version__.py,sha256=VkT9SDxmqx5TY0atB540yqsbLb0xRC7qK2gKY9KwH-8,26
+sxs/__version__.py,sha256=_9lez8F-P5_DyC5BnNYRR80QCTJTvii8eLWtZFGFjkg,26
 sxs/handlers.py,sha256=Lu3rY7jHn3jEwnUDHVZgZIv1-3AAPAXD61baZAO49a8,17909
 sxs/juliapkg.json,sha256=-baaa3Za_KBmmiGjlh2YYLWmvUvZl6GaKKXwNI4S7qU,178
 sxs/time_series.py,sha256=OKaLg8tFyrtKcef7900ri-a0C6A8wKxA68KovZXvH6I,41081
@@ -7,7 +7,7 @@ sxs/caltechdata/__init__.py,sha256=pvyc2Djch4DA6t06op-0NSTegrMSywzNi7Z3W_91-Cg,1
 sxs/caltechdata/catalog.py,sha256=E2nystCaMZLKxTlLgfbfpGkckfkLyIzhn3YeEI3nQYc,4914
 sxs/caltechdata/login.py,sha256=JaNyawXLSq37R1qbGM0fuTbfXmbHHnixEzU7nhwAGeE,21546
 sxs/catalog/__init__.py,sha256=9-WTMTPDmqqkFyIHOtEbPA6etXm3_RSRrLWvHtLrjLg,205
-sxs/catalog/catalog.py,sha256=3sUNREH-eyNwtjBVW9MKih_B6hHooPj_I1OYxP_adao,26804
+sxs/catalog/catalog.py,sha256=R2tO7kpIqBgobvk9tDsvHTYNTH432dlWDrMiBL5g8Nk,25562
 sxs/catalog/create.py,sha256=KL3zHljdLADeLfTDMTSkcVjIFim92Ylc-ziEvpiflEU,4734
 sxs/catalog/description.py,sha256=4eHMde4oGNp69jRmXCsfrIYJ4WK5HYgYFgXyF5htLDM,10830
 sxs/horizons/__init__.py,sha256=f7Zfkj9-r-4IOa-LFuqvChxLDMz6nNiAjsjXCG_uWw0,19194
@@ -82,7 +82,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.44.dist-info/METADATA,sha256=T73d-Ee58PLzfKUG8mM4fBxZ_r3C3mFQAB-oP-fS8rk,9253
-sxs-2024.0.44.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sxs-2024.0.44.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
-sxs-2024.0.44.dist-info/RECORD,,
+sxs-2024.0.45.dist-info/METADATA,sha256=KQfQa6TWChYuOobDSKiswEO9JoxG6W1_PGKL-pvXmis,9253
+sxs-2024.0.45.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sxs-2024.0.45.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
+sxs-2024.0.45.dist-info/RECORD,,