Merge pull request #14083 from meeseeksmachine/auto-backport-of-pr-14…

…075-on-v5.2.x Backport PR #14075 on branch v5.2.x (TST: Fix devdeps job)
astropy · Dec 1, 2022 · 7a8d1cf · 7a8d1cf
2 parents 9318eab + 365364c
commit 7a8d1cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/astropy/io/ascii/core.py b/astropy/io/ascii/core.py
@@ -1143,7 +1143,7 @@ def _convert_vals(self, cols):
                             f" column {col.name}, reverting to String.",
                             AstropyWarning,
                         )
-                        col.converters.insert(0, convert_numpy(numpy.str))
+                        col.converters.insert(0, convert_numpy(str))
                     else:
                         col.converters.pop(0)
                     last_err = err

diff --git a/astropy/table/tests/test_table.py b/astropy/table/tests/test_table.py
@@ -2158,7 +2158,10 @@ def test_masking(self, use_nullable_int):
                 else:
                     assert t2[name].dtype.kind == "i"
 
-                assert_array_equal(column.data, t2[name].data.astype(column.dtype))
+                # This warning pops up when use_nullable_int is False
+                # for pandas 1.5.2.
+                with np.errstate(invalid="ignore"):
+                    assert_array_equal(column.data, t2[name].data.astype(column.dtype))
             else:
                 if column.dtype.byteorder in ("=", "|"):
                     assert column.dtype == t2[name].dtype