fixups

Author: TomAugspurger

pandas/tests/extension/base/dtype.py

@@ -69,11 +69,10 @@ def test_check_dtype(self, data):
             expected = pd.Series([True, True, False, False],
                                  index=list('ABCD'))
 
-        with warnings.catch_warnings():
             # XXX: This should probably be *fixed* not ignored.
             # See libops.scalar_compare
-            warnings.simplefilter("ignore", DeprecationWarning)
-            result = df.dtypes == str(dtype)
+            # warnings.simplefilter("ignore", DeprecationWarning)
+        result = df.dtypes == str(dtype)
         self.assert_series_equal(result, expected)
 
         expected = pd.Series([True, True, False, False],

pandas/tests/indexes/datetimes/test_tools.py

@@ -1589,15 +1589,18 @@ def units_from_epochs():
     return list(range(5))
 
 
-@pytest.fixture(params=['timestamp', 'pydatetime', 'datetime64'])
+@pytest.fixture(params=['timestamp', 'pydatetime', 'datetime64', 'str_1960'])
 def epochs(epoch_1960, request):
-    assert request.param in {'timestamp', 'pydatetime', 'datetime64'}
+    assert request.param in {'timestamp', 'pydatetime', 'datetime64',
+                             "str_1960"}
     if request.param == 'timestamp':
         return epoch_1960
     elif request.param == 'pydatetime':
         return epoch_1960.to_pydatetime()
-    else:
+    elif request.param == "datetime64":
         return epoch_1960.to_datetime64()
+    else:
+        return str(epoch_1960)
 
 
 @pytest.fixture

pandas/tests/test_downstream.py

@@ -63,7 +63,7 @@ def test_oo_optimizable():
 
 @tm.network
 # Cython import warning
-@pytest.mark.filterwarnings("ignore::ImportWarning")
+@pytest.mark.filterwarnings("ignore:can't:ImportWarning")
 def test_statsmodels():
 
     statsmodels = import_module('statsmodels')  # noqa
@@ -74,7 +74,7 @@ def test_statsmodels():
 
 
 # Cython import warning
-@pytest.mark.filterwarnings("ignore::ImportWarning")
+@pytest.mark.filterwarnings("ignore:can't:ImportWarning")
 def test_scikit_learn(df):
 
     sklearn = import_module('sklearn')  # noqa
@@ -110,8 +110,10 @@ def test_pandas_datareader():
         'F', 'quandl', '2017-01-01', '2017-02-01')
 
 
-# importing from pandas, Cython mport warning
-@pytest.mark.filterwarnings("ignore")
+# importing from pandas, Cython import warning
+@pytest.mark.filterwarnings("ignore:The 'warn':DeprecationWarning")
+@pytest.mark.filterwarnings("ignore:pandas.util:DeprecationWarning")
+@pytest.mark.filterwarnings("ignore:can't resolve:ImportWarning")
 def test_geopandas():
 
     geopandas = import_module('geopandas')  # noqa
@@ -120,7 +122,7 @@ def test_geopandas():
 
 
 # Cython import warning
-@pytest.mark.filterwarnings("ignore")
+@pytest.mark.filterwarnings("ignore:can't resolve:ImportWarning")
 def test_pyarrow(df):
 
     pyarrow = import_module('pyarrow')  # noqa