Merge pull request #796 from bashtage/econdb-master

bashtage · web-flow · commit b5e63468ca6c · 2020-07-07T00:29:00.000+01:00
Econdb master
diff --git a/.travis.yml b/.travis.yml
@@ -10,34 +10,32 @@ env:
 matrix:
   fast_finish: true
   include:
-  - python: 3.5
-    env: PANDAS=0.21 NUMPY=1.13
-  - python: 3.5
-    env: PANDAS=0.22 NUMPY=1.13
   - python: 3.6
-    env: PANDAS=0.23 NUMPY=1.14
+    env: PANDAS=0.23 NUMPY=1.16
   - python: 3.7
     env: PANDAS=0.25 NUMPY=1.17 DOCBUILD=true
   - python: 3.7
-    env: PANDAS=0.25 NUMPY=1.17
-  - python: 3.7
-    env: TEST_TYPE="quandl" PANDAS=0.25 NUMPY=1.17
-  - python: 3.8
     env: PANDAS=0.25 NUMPY=1.18
+  - python: 3.8
+    env: PANDAS=1 NUMPY=1.18
+  - python: 3.8
+    env: PANDAS=1 NUMPY=1.19
+  - python: 3.7
+    env: TEST_TYPE="quandl" PANDAS=1 NUMPY=1.19
     # In allow failures
   - python: 3.7
-    env: TEST_TYPE="alpha_vantage" PANDAS=0.25 NUMPY=1.17
+    env: TEST_TYPE="alpha_vantage" PANDAS=1 NUMPY=1.19
   - python: 3.7
-    env: TEST_TYPE="not stable and not alpha_vantage and not quandl" PANDAS=0.25 NUMPY=1.17
+    env: TEST_TYPE="not stable and not alpha_vantage and not quandl" PANDAS=1 NUMPY=1.19
   - python: 3.7
-    env: PANDAS="MASTER" NUMPY=1.17
+    env: PANDAS="MASTER" NUMPY=1.18
   allow_failures:
     - python: 3.7
       env: PANDAS="MASTER" NUMPY=1.17
     - python: 3.7
-      env: TEST_TYPE="alpha_vantage" PANDAS=0.25 NUMPY=1.17
+      env: TEST_TYPE="alpha_vantage" PANDAS=1 NUMPY=1.19
     - python: 3.7
-      env: TEST_TYPE="not stable and not alpha_vantage and not quandl" PANDAS=0.25 NUMPY=1.17
+      env: TEST_TYPE="not stable and not alpha_vantage and not quandl" PANDAS=1 NUMPY=1.19
 
 install:
   - source ci/pypi-install.sh;
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -13,8 +13,14 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+import IPython
+
 import pandas_datareader as pdr
 import sphinx_rtd_theme
 
@@ -33,10 +39,6 @@
 #
 # needs_sphinx = '1.0'
 
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-import IPython
 
 extensions = [
     "sphinx.ext.autodoc",
diff --git a/pandas_datareader/base.py b/pandas_datareader/base.py
@@ -1,10 +1,10 @@
 import datetime
 import time
+from urllib.parse import urlencode
 import warnings
 
 import numpy as np
 from pandas import DataFrame, concat, read_csv
-from urllib.parse import urlencode
 import requests
 
 from pandas_datareader._utils import (
diff --git a/pandas_datareader/compat/__init__.py b/pandas_datareader/compat/__init__.py
@@ -14,7 +14,6 @@
 PANDAS_0220 = PANDAS_VERSION >= LooseVersion("0.22.0")
 PANDAS_0230 = PANDAS_VERSION >= LooseVersion("0.23.0")
 
-
 __all__ = [
     "HTTPError",
     "StringIO",
diff --git a/pandas_datareader/data.py b/pandas_datareader/data.py
@@ -16,25 +16,36 @@
 from pandas_datareader.econdb import EcondbReader
 from pandas_datareader.enigma import EnigmaReader
 from pandas_datareader.eurostat import EurostatReader
-from pandas_datareader.exceptions import DEP_ERROR_MSG, ImmediateDeprecationError
+from pandas_datareader.exceptions import (
+    DEP_ERROR_MSG,
+    ImmediateDeprecationError,
+)
 from pandas_datareader.famafrench import FamaFrenchReader
 from pandas_datareader.fred import FredReader
 from pandas_datareader.iex.daily import IEXDailyReader
 from pandas_datareader.iex.deep import Deep as IEXDeep
-from pandas_datareader.iex.tops import LastReader as IEXLasts, TopsReader as IEXTops
+from pandas_datareader.iex.tops import (
+    LastReader as IEXLasts,
+    TopsReader as IEXTops,
+)
 from pandas_datareader.moex import MoexReader
 from pandas_datareader.nasdaq_trader import get_nasdaq_symbols
 from pandas_datareader.oecd import OECDReader
 from pandas_datareader.quandl import QuandlReader
-from pandas_datareader.robinhood import RobinhoodHistoricalReader, RobinhoodQuoteReader
+from pandas_datareader.robinhood import (
+    RobinhoodHistoricalReader,
+    RobinhoodQuoteReader,
+)
 from pandas_datareader.stooq import StooqDailyReader
 from pandas_datareader.tiingo import (
     TiingoDailyReader,
     TiingoIEXHistoricalReader,
     TiingoQuoteReader,
 )
 from pandas_datareader.yahoo.actions import YahooActionReader, YahooDivReader
-from pandas_datareader.yahoo.components import _get_data as get_components_yahoo
+from pandas_datareader.yahoo.components import (
+    _get_data as get_components_yahoo,
+)
 from pandas_datareader.yahoo.daily import YahooDailyReader
 from pandas_datareader.yahoo.options import Options as YahooOptions
 from pandas_datareader.yahoo.quotes import YahooQuotesReader
diff --git a/pandas_datareader/econdb.py b/pandas_datareader/econdb.py
@@ -1,4 +1,5 @@
 import pandas as pd
+
 from pandas_datareader.base import _BaseReader
 
 
@@ -27,25 +28,27 @@ def read(self):
         if self._show == "labels":
 
             def show_func(x):
-                return x.split(":")[1]
+                return x[x.find(":") + 1 :]
 
         elif self._show == "codes":
 
             def show_func(x):
-                return x.split(":")[0]
+                return x[: x.find(":")]
 
         for entry in results:
             series = pd.DataFrame(entry["data"])[["dates", "values"]].set_index("dates")
-
             head = entry["additional_metadata"]
+
             if head != "":  # this additional metadata is not blank
                 series.columns = pd.MultiIndex.from_tuples(
                     [[show_func(x) for x in head.values()]],
                     names=[show_func(x) for x in head.keys()],
                 )
+            else:
+                series.rename(columns={"values": entry["ticker"]}, inplace=True)
 
             if not df.empty:
-                df = df.join(series, how="outer")
+                df = df.merge(series, how="outer", left_index=True, right_index=True)
             else:
                 df = series
         if df.shape[0] > 0:
diff --git a/pandas_datareader/iex/__init__.py b/pandas_datareader/iex/__init__.py
@@ -1,7 +1,7 @@
 import json
+from urllib.parse import urlencode
 
 import pandas as pd
-from urllib.parse import urlencode
 
 from pandas_datareader.base import _BaseReader
 
diff --git a/pandas_datareader/moex.py b/pandas_datareader/moex.py
@@ -3,7 +3,12 @@
 import pandas as pd
 
 from pandas_datareader.base import _DailyBaseReader
-from pandas_datareader.compat import StringIO, binary_type, concat, is_list_like
+from pandas_datareader.compat import (
+    StringIO,
+    binary_type,
+    concat,
+    is_list_like,
+)
 
 
 class MoexReader(_DailyBaseReader):
diff --git a/pandas_datareader/robinhood.py b/pandas_datareader/robinhood.py
@@ -1,7 +1,10 @@
 import pandas as pd
 
 from pandas_datareader.base import _BaseReader
-from pandas_datareader.exceptions import DEP_ERROR_MSG, ImmediateDeprecationError
+from pandas_datareader.exceptions import (
+    DEP_ERROR_MSG,
+    ImmediateDeprecationError,
+)
 
 
 class RobinhoodQuoteReader(_BaseReader):
diff --git a/pandas_datareader/tests/test_base.py b/pandas_datareader/tests/test_base.py
@@ -1,4 +1,5 @@
 import datetime as dt
+
 import pytest
 import requests
 
diff --git a/pandas_datareader/tests/test_econdb.py b/pandas_datareader/tests/test_econdb.py
@@ -48,11 +48,23 @@ def test_get_tourism(self):
         us = np.array(
             [175702304, 160507424, 164079728, 167600272, 171320416], dtype=float
         )
+        index = pd.date_range("2008-01-01", "2012-01-01", freq="AS", name="TIME_PERIOD")
 
         # check the values coming back are equal
         np.testing.assert_array_equal(df.values[:, 0], jp)
         np.testing.assert_array_equal(df.values[:, 1], us)
 
+        # sometimes the country and variable columns are swapped
+        df = df.swaplevel(2, 1, axis=1)
+        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]["Tourism demand surveys"]["Total international arrivals"],
+                expected,
+            )
+
     def test_bls(self):
         # BLS
         # CPI
@@ -64,3 +76,20 @@ def test_bls(self):
         )
 
         assert df.loc["2010-05-01"][0] == 217.3
+
+    def test_australia_gdp(self):
+
+        df = web.DataReader(
+            "dataset=ABS_GDP&to=2019-09-01&from=1959-09-01&h=TIME&v=Indicator", "econdb"
+        )
+        assert (
+            df.loc[
+                "2017-10-01",
+                (
+                    "GDP per capita: Current prices - National Accounts",
+                    "Seasonally Adjusted",
+                    "AUD",
+                ),
+            ]
+            == 18329
+        )
diff --git a/pandas_datareader/tests/test_robinhood.py b/pandas_datareader/tests/test_robinhood.py
@@ -2,7 +2,10 @@
 import pandas as pd
 import pytest
 
-from pandas_datareader.robinhood import RobinhoodHistoricalReader, RobinhoodQuoteReader
+from pandas_datareader.robinhood import (
+    RobinhoodHistoricalReader,
+    RobinhoodQuoteReader,
+)
 
 syms = ["GOOG", ["GOOG", "AAPL"]]
 ids = list(map(str, syms))
diff --git a/pandas_datareader/tests/test_utils.py b/pandas_datareader/tests/test_utils.py
@@ -1,4 +1,5 @@
 import datetime as dt
+
 import pandas as pd
 import pytest
 
diff --git a/pandas_datareader/yahoo/components.py b/pandas_datareader/yahoo/components.py
@@ -1,7 +1,10 @@
 from pandas import DataFrame
 from pandas.io.common import urlopen
 
-from pandas_datareader.exceptions import DEP_ERROR_MSG, ImmediateDeprecationError
+from pandas_datareader.exceptions import (
+    DEP_ERROR_MSG,
+    ImmediateDeprecationError,
+)
 
 _URL = "http://download.finance.yahoo.com/d/quotes.csv?"
 
diff --git a/pandas_datareader/yahoo/options.py b/pandas_datareader/yahoo/options.py
@@ -3,7 +3,14 @@
 import warnings
 
 import numpy as np
-from pandas import DataFrame, DatetimeIndex, MultiIndex, Series, concat, to_datetime
+from pandas import (
+    DataFrame,
+    DatetimeIndex,
+    MultiIndex,
+    Series,
+    concat,
+    to_datetime,
+)
 from pandas.io.json import read_json
 from pandas.tseries.offsets import MonthEnd
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 lxml
-pandas>=0.21
-requests>=2.3.0
+pandas>=0.23
+requests>=2.19.0
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 import versioneer
 
diff --git a/versioneer.py b/versioneer.py
@@ -277,17 +277,18 @@
 
 from __future__ import print_function
 
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
 import errno
 import json
 import os
 import re
 import subprocess
 import sys
 
+try:
+    import configparser
+except ImportError:
+    import ConfigParser as configparser
+
 
 class VersioneerConfig:
     """Container for Versioneer configuration parameters."""

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import datetime as dt`
	`2`	`+`
`2`	`3`	`import pytest`
`3`	`4`	`import requests`
`4`	`5`