try to bypass key error

desihub · Jan 7, 2025 · e43d296 · e43d296
1 parent f79d97c
commit e43d296
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/py/desiutil/iers.py b/py/desiutil/iers.py
@@ -121,9 +121,15 @@ def _check_interpolate_indices(self, indices_orig, indices_clipped,
     else:
         astropy.utils.iers.conf.iers_degraded_accuracy = 'warn'
     # Sanity check.
-    auto_class = astropy.utils.iers.IERS_Auto.open()
-    if auto_class is not iers:
-        raise RuntimeError('Frozen IERS is not installed as the default ({0} v. {1}).'.format(auto_class.__class__, iers.__class__))
+    # In Astropy 7 this appears to be broken due to the iers_frozen.ecsv being out of date.
+    # The *format* of that file no longer matches what is expected by astropy.util.iers.
+    try:
+        auto_class = astropy.utils.iers.IERS_Auto.open()
+        if auto_class is not iers:
+            raise RuntimeError('Frozen IERS is not installed as the default ({0} v. {1}).'.format(auto_class.__class__, iers.__class__))
+    except KeyError:
+        # Temporary Astropy 7/IERS workaround.
+        warnings.warn("Temporarily skipping IERS integrity check.", UserWarning)
 
     if ignore_warnings:
         try:

diff --git a/py/desiutil/test/test_io.py b/py/desiutil/test/test_io.py
@@ -125,7 +125,7 @@ def test_yamlify(self):
                  'num2': np.int64(4), 'bool': np.bool_(True),
                  'lst': ['tst2', np.int16(2)],
                  'tup': (1, 3), 'dct': {'a': 'tst3', 'b': np.float32(6.)},
-                 'npstring' : np.str_('abcd'),
+                 'npstring': np.str_('abcd'),
                  'array': np.zeros(10)}
         self.assertIsInstance(fdict['name'], str)
         # Run