sxs 2024.0.38__tar.gz → 2024.0.39__tar.gz

{sxs-2024.0.38 → sxs-2024.0.39}/.github/workflows/build.yml

@@ -36,9 +36,9 @@ jobs:
             python-version: '3.13'
 
     steps:
-      - name: Skip replicates on main branch
+      - name: Skip replicates unless on main branch or using ubuntu-latest
         env:
-          skip_replicates: ${{ github.ref == 'refs/heads/main' && matrix.os != 'ubuntu-latest' }}
+          skip_replicates: ${{ github.ref != 'refs/heads/main' && matrix.os != 'ubuntu-latest' }}
         shell: bash
         run: |
           echo "skipping_build_and_test_replicate=${skip_replicates}" >> $GITHUB_ENV
@@ -58,6 +58,8 @@ jobs:
       - name: Cache Julia
         if: ${{ env.skipping_build_and_test_replicate != 'true' }}
         uses: julia-actions/cache@v2
+        with:
+          include-matrix: false
 
       - name: Check out code
         if: ${{ env.skipping_build_and_test_replicate != 'true' }}

{sxs-2024.0.38 → sxs-2024.0.39}/CITATION.cff

@@ -10,5 +10,5 @@ authors:
 title: "The sxs package"
 license: MIT
 doi: 10.5281/zenodo.4034006
-version: 2024.0.38
+version: 2024.0.39
 date-released: 2025-02-24

{sxs-2024.0.38 → sxs-2024.0.39}/PKG-INFO

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

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

{sxs-2024.0.38 → sxs-2024.0.39}/sxs/metadata/metadata.py

@@ -622,11 +622,16 @@ class Metadata(collections.OrderedDict):
     def setdefault(self, key, default=None):
         return super(Metadata, self).setdefault(_valid_identifier(key), default)
 
-    def update(self, mapping_or_iterable=None, **kwargs):
-        if isinstance(mapping_or_iterable, collections.abc.Mapping):
-            mapping_or_iterable = collections.OrderedDict(
-                [(_valid_identifier(key), mapping_or_iterable[key]) for key in mapping_or_iterable]
-            )
-        elif isinstance(mapping_or_iterable, collections.abc.Iterable):
-            mapping_or_iterable = [(_valid_identifier(k), v) for k, v in mapping_or_iterable]
-        return super(Metadata, self).update(mapping_or_iterable)
+    def update(self, mapping_or_iterable=None, /, **kwargs):
+        # This should be just the same as the collections.OrderedDict.update
+        # method, except that identifiers passed in via mapping_or_iterable
+        # have to be converted to valid identifiers first.
+        if mapping_or_iterable is not None:
+            if hasattr(mapping_or_iterable, "keys") and callable(mapping_or_iterable.keys):
+                for k in mapping_or_iterable:
+                    self[_valid_identifier(k)] = mapping_or_iterable[k]
+            else:
+                for k, v in mapping_or_iterable:
+                    self[_valid_identifier(k)] = v
+        for k in kwargs:
+            self[k] = kwargs[k]

{sxs-2024.0.38 → sxs-2024.0.39}/tests/test_metadata.py

@@ -30,3 +30,26 @@ def test_json_conversion():
         for key in m2:
             if key.startswith("reference_") or  key.startswith("initial_"):
                 assert m1[key] == m2[key]
+
+
+@skip_macOS_GH_actions_downloads
+def test_metadata_updates():
+    with contextlib.redirect_stdout(None):
+        metadata = sxs.load(shortest_metadata)
+    assert metadata.reference_time != -123456.789
+
+    # Test updating with kwargs
+    metadata.update(reference_time=-123456.789)
+    assert metadata.reference_time == -123456.789
+
+    # Test updating with a Mapping
+    metadata.update({"reference_time": 9.876})
+    assert metadata.reference_time == 9.876
+
+    # Test updating with a Mapping that is not a dict
+    metadata.update({"reference_time": 9.876}.items())
+    assert metadata.reference_time == 9.876
+
+    # Test updating with an Iterable
+    metadata.update([("reference_time", 54637.2819)])
+    assert metadata.reference_time == 54637.2819

sxs-2024.0.38/sxs/__version__.py

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