Merge pull request #795 from bashtage/black-code

MAINT: Fix failing tests

Author: bashtage

pandas_datareader/tests/io/test_jsdmx.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 import pandas as pd
-import pandas.util.testing as tm
+import pandas.testing as tm
 import pytest
 
 from pandas_datareader.compat import PANDAS_0210

pandas_datareader/tests/io/test_sdmx.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 import pandas as pd
-import pandas.util.testing as tm
+import pandas.testing as tm
 import pytest
 
 from pandas_datareader.io.sdmx import _read_sdmx_dsd, read_sdmx

pandas_datareader/tests/test_econdb.py

@@ -1,6 +1,6 @@
 import numpy as np
 import pandas as pd
-import pandas.util.testing as tm
+import pandas.testing as tm
 import pytest
 
 import pandas_datareader.data as web
@@ -50,8 +50,8 @@ def test_get_tourism(self):
         )
 
         # check the values coming back are equal
-        tm.assert_numpy_array_equal(df.values[:, 0], jp)
-        tm.assert_numpy_array_equal(df.values[:, 1], us)
+        np.testing.assert_array_equal(df.values[:, 0], jp)
+        np.testing.assert_array_equal(df.values[:, 1], us)
 
     def test_bls(self):
         # BLS

pandas_datareader/tests/test_eurostat.py

@@ -1,6 +1,6 @@
 import numpy as np
 import pandas as pd
-import pandas.util.testing as tm
+import pandas.testing as tm
 import pytest
 
 import pandas_datareader.data as web

pandas_datareader/tests/test_famafrench.py

@@ -1,5 +1,5 @@
 import pandas as pd
-import pandas.util.testing as tm
+import pandas.testing as tm
 import pytest
 
 import pandas_datareader.data as web

pandas_datareader/tests/test_fred.py

@@ -3,7 +3,7 @@
 import numpy as np
 import pandas as pd
 from pandas import DataFrame
-import pandas.util.testing as tm
+import pandas.testing as tm
 import pytest
 
 from pandas_datareader._utils import RemoteDataError
@@ -52,7 +52,7 @@ def test_fred_parts(self):  # pragma: no cover
     def test_fred_part2(self):
         expected = [[576.7], [962.9], [684.7], [848.3], [933.3]]
         result = web.get_data_fred("A09024USA144NNBR", start="1915").iloc[:5]
-        tm.assert_numpy_array_equal(result.values, np.array(expected))
+        np.testing.assert_array_equal(result.values, np.array(expected))
 
     def test_invalid_series(self):
         name = "NOT A REAL SERIES"

pandas_datareader/tests/test_moex.py

@@ -21,6 +21,6 @@ def test_moex_stock_datareader(self):
             df = web.DataReader(
                 ["GAZP", "SIBN"], "moex", start="2019-12-26", end="2019-12-26"
             )
-            assert df.size == 720
+            assert df.size == 740
         except HTTPError as e:
             pytest.skip(e)

pandas_datareader/tests/test_oecd.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 import pandas as pd
-import pandas.util.testing as tm
+import pandas.testing as tm
 import pytest
 
 from pandas_datareader._utils import RemoteDataError
@@ -201,10 +201,9 @@ def test_get_tourism(self):
         )
         index = pd.date_range("2008-01-01", "2012-01-01", freq="AS", name="Year")
         for label, values in [("Japan", jp), ("United States", us)]:
-            expected = pd.Series(
-                values, index=index, name="Total international arrivals"
-            )
-            tm.assert_series_equal(df[label]["Total international arrivals"], expected)
+            expected = pd.Series(values, index=index, name="Tourism demand surveys")
+            series = df[label]["Total international arrivals"]["Tourism demand surveys"]
+            tm.assert_series_equal(series, expected)
 
     def test_oecd_invalid_symbol(self):
         with pytest.raises(RemoteDataError):

pandas_datareader/tests/test_wb.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 import pandas as pd
-import pandas.util.testing as tm
+import pandas.testing as tm
 import pytest
 import requests
 
@@ -148,7 +148,7 @@ def test_wdi_download_error_handling(self):
                 errors="raise",
             )
 
-        with tm.assert_produces_warning():
+        with pytest.warns(Warning):
             result = download(
                 country=cntry_codes, indicator=inds, start=2003, end=2004, errors="warn"
             )
@@ -168,7 +168,7 @@ def test_wdi_download_error_handling(self):
                 errors="raise",
             )
 
-        with tm.assert_produces_warning():
+        with pytest.warns(Warning):
             result = download(
                 country=cntry_codes, indicator=inds, start=2003, end=2004, errors="warn"
             )

pandas_datareader/tests/yahoo/test_options.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 import pandas as pd
-import pandas.util.testing as tm
+import pandas.testing as tm
 import pytest
 
 import pandas_datareader.data as web