Merge pull request #688 from bashtage/update-reqs

MAINT: Update requirements

Author: bashtage

.travis.yml

@@ -46,7 +46,7 @@ install:
 
 script:
   - if [[ -n "${TEST_TYPE+x}" ]]; then export MARKERS="-m ${TEST_TYPE}"; fi
-  - pytest -s -r xX "${MARKERS}" --cov-config .coveragerc --cov=pandas_datareader --cov-report xml:/tmp/cov-datareader.xml --junitxml=/tmp/datareader.xml
+  - pytest -v -s -r xX "${MARKERS}" --cov-config .coveragerc --cov=pandas_datareader --cov-report xml:/tmp/cov-datareader.xml --junitxml=/tmp/datareader.xml
   - |
     if [[ "$TRAVIS_PYTHON_VERSION" -gt 3.5 ]]; then
       black --check pandas_datareader

pandas_datareader/base.py

@@ -12,7 +12,13 @@
     _init_session,
     _sanitize_dates,
 )
-from pandas_datareader.compat import StringIO, binary_type, bytes_to_str, string_types
+from pandas_datareader.compat import (
+    PANDAS_0230,
+    StringIO,
+    binary_type,
+    bytes_to_str,
+    string_types,
+)
 
 
 class _BaseReader(object):
@@ -260,7 +266,10 @@ def _dl_mult_symbols(self, symbols):
                 df_na[:] = np.nan
                 for sym in failed:
                     stocks[sym] = df_na
-            result = concat(stocks).unstack(level=0)
+            if PANDAS_0230:
+                result = concat(stocks, sort=True).unstack(level=0)
+            else:
+                result = concat(stocks).unstack(level=0)
             result.columns.names = ["Attributes", "Symbols"]
             return result
         except AttributeError:

pandas_datareader/compat/__init__.py

@@ -2,49 +2,31 @@
 import sys
 
 import pandas as pd
+from pandas.api.types import is_list_like, is_number
 import pandas.io.common as com
+from pandas.util.testing import assert_frame_equal
 
 PY3 = sys.version_info >= (3, 0)
 
 PANDAS_VERSION = LooseVersion(pd.__version__)
 
-PANDAS_0190 = PANDAS_VERSION >= LooseVersion("0.19.0")
-PANDAS_0200 = PANDAS_VERSION >= LooseVersion("0.20.0")
 PANDAS_0210 = PANDAS_VERSION >= LooseVersion("0.21.0")
+PANDAS_0220 = PANDAS_VERSION >= LooseVersion("0.22.0")
 PANDAS_0230 = PANDAS_VERSION >= LooseVersion("0.23.0")
 
-if PANDAS_0190:
-    from pandas.api.types import is_number
-    from pandas.util.testing import assert_frame_equal
-else:
-    from pandas.core.common import is_number
-    from pandas.testing import assert_frame_equal
-
-if PANDAS_0200:
-    from pandas.util.testing import assert_raises_regex
 
-    def get_filepath_or_buffer(filepath_or_buffer, encoding=None, compression=None):
+def get_filepath_or_buffer(filepath_or_buffer, encoding=None, compression=None):
 
-        # Dictionaries are no longer considered valid inputs
-        # for "get_filepath_or_buffer" starting in pandas >= 0.20.0
-        if isinstance(filepath_or_buffer, dict):
-            return filepath_or_buffer, encoding, compression
+    # Dictionaries are no longer considered valid inputs
+    # for "get_filepath_or_buffer" starting in pandas >= 0.20.0
+    if isinstance(filepath_or_buffer, dict):
+        return filepath_or_buffer, encoding, compression
 
-        return com.get_filepath_or_buffer(
-            filepath_or_buffer, encoding=encoding, compression=None
-        )
+    return com.get_filepath_or_buffer(
+        filepath_or_buffer, encoding=encoding, compression=None
+    )
 
 
-else:
-    from pandas.util.testing import assertRaisesRegexp as assert_raises_regex
-
-    get_filepath_or_buffer = com.get_filepath_or_buffer
-
-if PANDAS_0190:
-    from pandas.api.types import is_list_like
-else:
-    from pandas.core.common import is_list_like
-
 if PY3:
     from urllib.error import HTTPError
     from functools import reduce

pandas_datareader/tests/test_eurostat.py

@@ -3,7 +3,6 @@
 import pandas.util.testing as tm
 import pytest
 
-from pandas_datareader.compat import assert_raises_regex
 import pandas_datareader.data as web
 
 pytestmark = pytest.mark.stable
@@ -146,7 +145,7 @@ def test_get_nrg_pc_202(self):
     def test_get_prc_hicp_manr_exceeds_limit(self):
         # see gh-149
         msg = "Query size exceeds maximum limit"
-        with assert_raises_regex(ValueError, msg):
+        with pytest.raises(ValueError, match=msg):
             web.DataReader(
                 "prc_hicp_manr",
                 "eurostat",

pandas_datareader/tests/test_wb.py

@@ -8,7 +8,6 @@
 
 from pandas_datareader._testing import skip_on_exception
 from pandas_datareader._utils import RemoteDataError
-from pandas_datareader.compat import assert_raises_regex
 from pandas_datareader.wb import (
     WorldBankReader,
     download,
@@ -17,6 +16,8 @@
     search,
 )
 
+pytestmark = pytest.mark.stable
+
 
 class TestWB(object):
     def test_wdi_search(self):
@@ -138,7 +139,7 @@ def test_wdi_download_error_handling(self):
         inds = "NY.GDP.PCAP.CD"
 
         msg = "Invalid Country Code\\(s\\): XX"
-        with assert_raises_regex(ValueError, msg):
+        with pytest.raises(ValueError, match=msg):
             download(
                 country=cntry_codes,
                 indicator=inds,
@@ -158,7 +159,7 @@ def test_wdi_download_error_handling(self):
         inds = ["NY.GDP.PCAP.CD", "BAD_INDICATOR"]
 
         msg = "The provided parameter value is not valid\\. " "Indicator: BAD_INDICATOR"
-        with assert_raises_regex(ValueError, msg):
+        with pytest.raises(ValueError, match=msg):
             download(
                 country=cntry_codes,
                 indicator=inds,
@@ -262,8 +263,8 @@ def test_wdi_get_indicators(self):
                     "topics",
                 ]
             )
-            # assert_index_equal doesn't exists
-            assert result.columns.equals(exp_col)
+            # Column order is version dependent, so check columns are present
+            assert sorted(result.columns) == sorted(exp_col)
             assert len(result) > 10000
 
     @skip_on_exception(RemoteDataError)

requirements.txt

@@ -1,5 +1,5 @@
 lxml
-pandas>=0.19.2
+pandas>=0.21
 pytest>=4.0.2
 requests>=2.3.0
 wrapt

setup.cfg

@@ -29,3 +29,5 @@ testpaths = pandas_datareader
 markers =
     stable: mark a test as applying to a stable reader
     requires_api_key: mark a test as requiring an API key
+    alpha_vantage: mark a test of the AlphaVantage reader
+    quandl: mark a test of the Quandl readaer

setup.py

@@ -35,7 +35,6 @@ def readme():
         'Environment :: Console',
         'Intended Audience :: Science/Research',
         'Operating System :: OS Independent',
-        'Programming Language :: Cython',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',

tox.ini

@@ -1,10 +1,10 @@
 [tox]
-envlist=py{27,35,36}
+envlist=py{27,35,36,37}
 
 [testenv]
 commands=
     pytest
 deps=
-    pytest
+    pytest>=4.0.2
     pytest-cov
     wrapt