Merge pull request #1999 from jwoillez/deprecation_fixes

Fix for CI issues

Author: keflavich

astroquery/gaia/tests/test_gaiatap.py

@@ -86,7 +86,7 @@ def test_query_object(self):
                                     'source_id',
                                     'source_id',
                                     None,
-                                    np.object)
+                                    object)
         self.__check_results_column(table,
                                     'table1_oid',
                                     'table1_oid',
@@ -112,7 +112,7 @@ def test_query_object(self):
                                     'source_id',
                                     'source_id',
                                     None,
-                                    np.object)
+                                    object)
         self.__check_results_column(table,
                                     'table1_oid',
                                     'table1_oid',
@@ -181,7 +181,7 @@ def test_query_object_async(self):
                                     'source_id',
                                     'source_id',
                                     None,
-                                    np.object)
+                                    object)
         self.__check_results_column(table,
                                     'table1_oid',
                                     'table1_oid',
@@ -207,7 +207,7 @@ def test_query_object_async(self):
                                     'source_id',
                                     'source_id',
                                     None,
-                                    np.object)
+                                    object)
         self.__check_results_column(table,
                                     'table1_oid',
                                     'table1_oid',
@@ -260,7 +260,7 @@ def test_cone_search_sync(self):
                                     'source_id',
                                     'source_id',
                                     None,
-                                    np.object)
+                                    object)
         self.__check_results_column(results,
                                     'table1_oid',
                                     'table1_oid',
@@ -337,7 +337,7 @@ def test_cone_search_async(self):
                                     'source_id',
                                     'source_id',
                                     None,
-                                    np.object)
+                                    object)
         self.__check_results_column(results,
                                     'table1_oid',
                                     'table1_oid',

astroquery/nasa_exoplanet_archive/core.py

@@ -430,7 +430,7 @@ def _fix_units(self, data):
                 data[col].mask[:] = False
 
             # Deal with strings consistently
-            if data[col].dtype == np.object:
+            if data[col].dtype == object:
                 data[col] = data[col].astype(str)
 
             data[col].unit = unit

astroquery/utils/tap/tests/test_tap.py

@@ -220,7 +220,7 @@ def test_launch_sync_job():
                            'source_id',
                            'source_id',
                            None,
-                           np.object)
+                           object)
     __check_results_column(results,
                            'table1_oid',
                            'table1_oid',
@@ -323,7 +323,7 @@ def test_launch_sync_job_redirect():
                            'source_id',
                            'source_id',
                            None,
-                           np.object)
+                           object)
     __check_results_column(results,
                            'table1_oid',
                            'table1_oid',
@@ -419,7 +419,7 @@ def test_launch_async_job():
                            'source_id',
                            'source_id',
                            None,
-                           np.object)
+                           object)
     __check_results_column(results,
                            'table1_oid',
                            'table1_oid',