PyPI - sxs - Versions diffs - 2024.0.17__tar.gz → 2024.0.18__tar.gz - Mend

@@ -236,7 +236,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
+    from .utilities import url, download_file, sxs_path_to_system_path, sxs_id_version_lev_exact_re, lev_path_re
     # Note: `download` and/or `cache` may still be `None` after this
     if download is None:
@@ -298,6 +298,17 @@ def load(location, download=None, cache=None, progress=None, truepath=None, **kw
             return Simulation(location, download=download, cache=cache, progress=progress, **kwargs)
         else:
+            # Try to find an appropriate SXS file in the simulations
+            simulations = Simulations.load(
+                download=download,
+                local=kwargs.get("local", False),
+                annex_dir=kwargs.get("annex_dir", None)
+            )
+            if lev_path_re.sub("", location) in simulations:
+                return Simulation(
+                    location, 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)

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

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

@@ -119,6 +119,8 @@ def Simulation(location, *args, **kwargs):
     series = simulations.dataframe.loc[simulation_id]
     # Check if the specified version exists in the simulation catalog
+    if not hasattr(metadata, "DOI_versions"):
+        input_version = "v0.0"
     if input_version != "v0.0" and input_version not in metadata.DOI_versions:
         raise ValueError(f"Version '{input_version}' not found in simulation catalog for '{simulation_id}'")

@@ -16,7 +16,7 @@ from .downloads import download_file
 from .bitwise import diff, xor, multishuffle
 from .sxs_identifiers import (
     sxs_identifier_regex, sxs_identifier_re,
-    lev_regex, lev_re,
+    lev_regex, lev_re, lev_path_re,
     sxs_id_version_lev_regex, sxs_id_version_lev_re,
     sxs_id_version_lev_exact_regex, sxs_id_version_lev_exact_re,
     sxs_path_regex, sxs_path_re,

@@ -18,6 +18,7 @@ sxs_path_regex = sxs_id_version_lev_regex + rf"(?:{sep_regex}{file_regex})?"
 sxs_identifier_re = re.compile(sxs_identifier_regex)
 lev_re = re.compile(lev_regex)
+lev_path_re = re.compile(f"{sep_regex}{lev_regex}")
 sxs_id_version_lev_re = re.compile(sxs_id_version_lev_regex)
 sxs_id_version_lev_exact_re = re.compile(sxs_id_version_lev_exact_regex)
 sxs_path_re = re.compile(sxs_path_regex)

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

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

sxs 2024.0.17__tar.gz → 2024.0.18__tar.gz