Fix MRT compat with astropy v6.0

spacetelescope · Nov 13, 2023 · 6a2f2c4 · 6a2f2c4
1 parent 083c688
commit 6a2f2c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/acstools/findsat_mrt.py b/acstools/findsat_mrt.py
@@ -1104,7 +1104,7 @@ def save_output(self, close_plot=True):
                 # an inconsequential warning so we suppress it here.
                 with warnings.catch_warnings():
                     warnings.filterwarnings('ignore',
-                                            message='Attribute `version` of')
+                                            message='Attribute `version` of.*')
                     self.source_list.write(cat_filename, overwrite=True)
             else:
                 # create an empty catalog and write that. It helps to have this

diff --git a/acstools/utils_findsat_mrt.py b/acstools/utils_findsat_mrt.py
@@ -108,7 +108,9 @@ def merge_tables(tbls, theta_sep=10, rho_sep=10):
             drho = np.abs(t['ycentroid'] - s['ycentroid'])
             sel = (dtheta < theta_sep) & (drho < rho_sep)
             keep[sel] = False
-        src = vstack([src, t[keep]])
+        # Silence MergeConflictWarning for "date" metadata because
+        # the tables were created with different timestamps. The last entry is kept.
+        src = vstack([src, t[keep]], metadata_conflicts="silent")
     return src