Merge branch 'master' into master

Author: bashtage

.travis.yml

@@ -1,94 +1,48 @@
-sudo: false
-
+dist: bionic
 language: python
 
 env:
   global:
     # Doctr deploy key for pydata/pandas-datareader
     - secure: "iGbOAbBSV5y0TKDh2CifRSk6OpLA9GbEEL/hscHFLSDDUCWcdfvYXda3SWJFWyoQ5QUxSigXWd+ukr4u92d7lmB7m3TWj6BAMNuRpatTgnejLNwLvNeYdvLAxPvx39Cq85frd1Rx1beBLn3h/4wm4Ah+dR5W9NH8+x3OuZMH3Eo="
 
-
 matrix:
   fast_finish: true
   include:
-  - dist: bionic
-    env:
-      - PYTHON=2.7 PANDAS=0.19.2
-  - dist: bionic
-    env:
-      - PYTHON=2.7 PANDAS=0.22
-  - dist: bionic
-    env:
-      - PYTHON=3.5 PANDAS=0.19.2
-  - dist: bionic
-    env:
-      - PYTHON=3.5 PANDAS=0.20.3
-  - dist: bionic
-    env:
-      - PYTHON=3.6 PANDAS=0.23.0
-  - dist: bionic
-    env:
-      - PYTHON=3.7 PANDAS=0.25 DOCBUILD=true
+  - python: 2.7
+    env: PANDAS=0.24 NUMPY=1.16
+  - 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
+  - python: 3.7
+    env: PANDAS=0.25 NUMPY=1.17 DOCBUILD=true
   # In allow failures
-  - dist: bionic
-    env:
-      - PYTHON=3.6 PANDAS="MASTER"
+  - env: PYTHON=3.7 PANDAS="MASTER"
   allow_failures:
-    - dist: bionic
-      env:
-        - PYTHON=3.6 PANDAS="MASTER"
+    - env: PYTHON=3.7 PANDAS="MASTER"
 
 install:
-  - pip install -qq flake8
-  # You may want to periodically update this, although the conda update
-  # conda line below will keep everything up-to-date.  We do this
-  # conditionally because it saves us some downloading if the version is
-  # the same.
-  - if [[ "$PYTHON" == "2.7" ]]; then
-      wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
-    else
-      wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
-    fi
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - export PATH="$HOME/miniconda/bin:$PATH"
-  - hash -r
-  - conda config --set always_yes yes --set changeps1 no
-  - conda config --add channels pandas
-  - conda update -q conda
-  # Useful for debugging any issues with conda
-  - conda info -a
-  - conda create -q -n test-environment python=$PYTHON coverage setuptools html5lib lxml pytest pytest-cov wrapt
-  - source activate test-environment
-  - if [[ "$PANDAS" == "MASTER" ]]; then
-      conda install numpy pytz python-dateutil;
-      PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com";
-      pip install --pre --upgrade --timeout=60 -f $PRE_WHEELS pandas;
-    else
-      conda install pandas=$PANDAS;
-    fi
-  - if [[ $DOCBUILD ]]; then
-      conda install sphinx ipython matplotlib;
-      pip install sphinx_rtd_theme doctr;
-    fi
-  - pip install pip --upgrade
-  - pip install codecov coveralls beautifulsoup4
-  - conda list
+  - source ci/pypi-install.sh;
+  - pip install codecov coveralls beautifulsoup4 flake8
+  - pip list
   - python setup.py install
 
 script:
-    - export ENIGMA_API_KEY=$ENIGMA_API_KEY
     - pytest -s -r xX --cov-config .coveragerc --cov=pandas_datareader --cov-report xml:/tmp/cov-datareader.xml --junitxml=/tmp/datareader.xml
     - flake8 --version
     - flake8 pandas_datareader
 
 after_script:
   - |
-    if [[ ${DOCBUILD} ]]; then
+    if [[ "$DOCBUILD" ]]; then
       cd docs
       make html && make html
       cd ..
       doctr deploy devel --build-tags
-      if [[ -z ${TRAVIS_TAG} ]]; then
+      if [[ -z "$TRAVIS_TAG" ]]; then
         echo "Not a tagged build."
       else
         doctr deploy stable --build-tags

README.rst

@@ -18,10 +18,6 @@ Up to date remote data access for pandas, works for multiple versions of pandas.
 .. image:: https://readthedocs.org/projects/pandas-datareader/badge/?version=latest
     :target: https://pandas-datareader.readthedocs.io/en/latest/
 
-.. image:: https://landscape.io/github/pydata/pandas-datareader/master/landscape.svg?style=flat
-   :target: https://landscape.io/github/pydata/pandas-datareader/master
-   :alt: Code Health
-
 .. warning::
 
    As of v0.7.0 Google finance and Morningstar have been been immediately deprecated due to

ci/pypi-install.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set +x
+echo "PyPI install"
+
+pip install pip --upgrade
+pip install numpy=="$NUMPY" pytz python-dateutil coverage setuptools html5lib lxml pytest pytest-cov wrapt
+if [[ "$PANDAS" == "MASTER" ]]; then
+  PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
+  pip install --pre --upgrade --timeout=60 -f "$PRE_WHEELS" pandas
+else
+  pip install pandas=="$PANDAS"
+fi
+if [[ "$DOCBUILD" ]]; then
+  pip install sphinx ipython matplotlib sphinx_rtd_theme doctr
+fi

pandas_datareader/base.py

@@ -133,7 +133,8 @@ def _get_response(self, url, params=None, headers=None):
             if response.status_code == requests.codes.ok:
                 return response
 
-            last_response_text = response.text.encode(response.encoding)
+            if response.encoding:
+                last_response_text = response.text.encode(response.encoding)
             time.sleep(pause)
 
             # Increase time between subsequent requests, per subclass.

pandas_datareader/econdb.py

@@ -1,3 +1,5 @@
+from pandas_datareader.compat import string_types
+
 import requests
 import pandas as pd
 

pandas_datareader/eurostat.py

@@ -10,7 +10,7 @@
 class EurostatReader(_BaseReader):
     """Get data for the given name from Eurostat."""
 
-    _URL = 'http://www.ec.europa.eu/eurostat/SDMX/diss-web/rest'
+    _URL = 'http://ec.europa.eu/eurostat/SDMX/diss-web/rest'
 
     @property
     def url(self):

pandas_datareader/tests/test_eurostat.py

@@ -70,7 +70,7 @@ def test_get_nrg_pc_202(self):
                             end=pd.Timestamp('2013-01-01'))
 
         name = ('All taxes and levies included',
-                'Gigajoules (gross calorific value - GCV)',
+                'Gigajoule (gross calorific value - GCV)',
                 'Euro',
                 'Band D1 : Consumption < 20 GJ',
                 'Natural gas', 'Denmark', 'Semi-annual')

requirements-dev.txt

@@ -2,3 +2,5 @@ ipython
 requests_cache
 sphinx
 sphinx_rtd_theme
+black
+isort

setup.cfg

@@ -7,3 +7,14 @@ style = pep440
 versionfile_source = pandas_datareader/_version.py
 versionfile_build = pandas_datareader/_version.py
 tag_prefix = v
+
+[isort]
+known_compat=pandas_datareader.compat.*
+sections=FUTURE,COMPAT,STDLIB,THIRDPARTY,PRE_CORE,FIRSTPARTY,LOCALFOLDER
+known_first_party=pandas_datareader
+known_third_party=numpy,pandas,pytest,requests
+multi_line_output=0
+force_grid_wrap=0
+combine_as_imports=True
+force_sort_within_sections=True
+line_width=99

setup.py

@@ -13,9 +13,11 @@ def readme():
         return f.read()
 
 
-INSTALL_REQUIRES = (
-    ['pandas>=0.19.2', 'requests>=2.3.0', 'wrapt', 'lxml']
-)
+install_requires = []
+with open("./requirements.txt") as f:
+    install_requires = f.read().splitlines()
+with open("./requirements-dev.txt") as f:
+    tests_require = f.read().splitlines()
 
 setup(
     name=NAME,
@@ -40,11 +42,13 @@ def readme():
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Scientific/Engineering',
     ],
     keywords='data',
-    install_requires=INSTALL_REQUIRES,
+    install_requires=install_requires,
     packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
     test_suite='tests',
+    tests_require=tests_require,
     zip_safe=False,
 )