Merge pull request #686 from bashtage/quandl-black

MAINT: Fix Quandl

Author: bashtage

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
 - [ ] closes #xxxx
 - [ ] tests added / passed
-- [ ] passes `git diff upstream/master -u -- "*.py" | flake8 --diff`
+- [ ] passes `black --check pandas_datareader`
 - [ ] added entry to docs/source/whatsnew/vLATEST.txt

.travis.yml

@@ -22,28 +22,35 @@ matrix:
     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
+    # In allow failures
+  - python: 3.7
+    env: TEST_TYPE="alpha_vantage" PANDAS=0.25 NUMPY=1.17
   - python: 3.7
     env: TEST_TYPE="not stable" PANDAS=0.25 NUMPY=1.17
-  # In allow failures
   - python: 3.7
     env: PANDAS="MASTER" NUMPY=1.17
   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
     - python: 3.7
       env: TEST_TYPE="not stable" PANDAS=0.25 NUMPY=1.17
 
 install:
   - source ci/pypi-install.sh;
-  - pip install codecov coveralls beautifulsoup4 flake8
   - pip list
   - python setup.py 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
-  - flake8 --version
-  - flake8 pandas_datareader
+  - |
+    if [[ "$TRAVIS_PYTHON_VERSION" -gt 3.5 ]]; then
+      black --check pandas_datareader
+    fi
 
 after_script:
   - |

ci/pypi-install.sh

@@ -1,15 +1,19 @@
 #!/usr/bin/env bash
 
-echo "PyPI install"
-
 pip install pip --upgrade
-pip install numpy=="$NUMPY" pytz python-dateutil coverage setuptools html5lib lxml pytest pytest-cov wrapt
+pip install numpy=="$NUMPY" pytz python-dateutil coverage setuptools html5lib lxml pytest pytest-cov wrapt codecov coveralls beautifulsoup4 isort
+
+if [[ "$TRAVIS_PYTHON_VERSION" != 2.7 ]]; then
+  pip install black
+fi
+
 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

docs/source/conf.py

@@ -39,37 +39,37 @@
 import IPython
 
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.extlinks',
-    'sphinx.ext.napoleon',
-    'IPython.sphinxext.ipython_directive',
-    'IPython.sphinxext.ipython_console_highlighting'
+    "sphinx.ext.autodoc",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.extlinks",
+    "sphinx.ext.napoleon",
+    "IPython.sphinxext.ipython_directive",
+    "IPython.sphinxext.ipython_console_highlighting",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'pandas-datareader'
-copyright = u'2018, The PyData Development Team'
-author = 'The PyData Development Team'
+project = u"pandas-datareader"
+copyright = u"2018, The PyData Development Team"
+author = "The PyData Development Team"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = pdr.__version__.split('+')[0]
+version = pdr.__version__.split("+")[0]
 # The full version, including alpha/beta/rc tags.
 release = pdr.__version__
 
@@ -86,7 +86,7 @@
 exclude_patterns = []
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = True
@@ -108,25 +108,25 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
 #
 # This is required for the alabaster theme
 # refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars
 html_sidebars = {
-    '**': [
-        'relations.html',  # needs 'show_related': True theme option to display
-        'searchbox.html',
+    "**": [
+        "relations.html",  # needs 'show_related': True theme option to display
+        "searchbox.html",
     ]
 }
 
 
 # -- Options for HTMLHelp output ------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'pandas-datareaderdoc'
+htmlhelp_basename = "pandas-datareaderdoc"
 
 
 # -- Options for LaTeX output ---------------------------------------------
@@ -135,15 +135,12 @@
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -153,8 +150,13 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'pandas-datareader.tex', 'pandas-datareader Documentation',
-     'pydata', 'manual'),
+    (
+        master_doc,
+        "pandas-datareader.tex",
+        "pandas-datareader Documentation",
+        "pydata",
+        "manual",
+    )
 ]
 
 
@@ -163,8 +165,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'pandas-datareader', 'pandas-datareader Documentation',
-     [author], 1)
+    (master_doc, "pandas-datareader", "pandas-datareader Documentation", [author], 1)
 ]
 
 
@@ -174,19 +175,23 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'pandas-datareader', 'pandas-datareader Documentation',
-     author, 'pandas-datareader', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "pandas-datareader",
+        "pandas-datareader Documentation",
+        author,
+        "pandas-datareader",
+        "One line description of project.",
+        "Miscellaneous",
+    )
 ]
 
 
-
-
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
+intersphinx_mapping = {"http://docs.python.org/": None}
 
 
-extlinks = {'issue': ('https://github.com/pydata/pandas-datareader/issues/%s',
-                      'GH'),
-            'wiki': ('https://github.com/pydata/pandas-datareader/wiki/%s',
-                     'wiki ')}
+extlinks = {
+    "issue": ("https://github.com/pydata/pandas-datareader/issues/%s", "GH"),
+    "wiki": ("https://github.com/pydata/pandas-datareader/wiki/%s", "wiki "),
+}

pandas_datareader/__init__.py

@@ -27,16 +27,34 @@
     get_tops_iex,
 )
 
-__version__ = get_versions()['version']
+__version__ = get_versions()["version"]
 del get_versions
 
-__all__ = ['__version__', 'get_components_yahoo', 'get_data_enigma',
-           'get_data_famafrench', 'get_data_yahoo',
-           'get_data_yahoo_actions', 'get_quote_yahoo',
-           'get_iex_book', 'get_iex_symbols', 'get_last_iex',
-           'get_markets_iex', 'get_recent_iex', 'get_records_iex',
-           'get_summary_iex', 'get_tops_iex',
-           'get_nasdaq_symbols', 'get_data_quandl', 'get_data_moex',
-           'get_data_fred', 'get_dailysummary_iex',
-           'get_data_stooq', 'DataReader', 'Options',
-           'get_data_tiingo', 'get_iex_data_tiingo', 'get_data_alphavantage']
+__all__ = [
+    "__version__",
+    "get_components_yahoo",
+    "get_data_enigma",
+    "get_data_famafrench",
+    "get_data_yahoo",
+    "get_data_yahoo_actions",
+    "get_quote_yahoo",
+    "get_iex_book",
+    "get_iex_symbols",
+    "get_last_iex",
+    "get_markets_iex",
+    "get_recent_iex",
+    "get_records_iex",
+    "get_summary_iex",
+    "get_tops_iex",
+    "get_nasdaq_symbols",
+    "get_data_quandl",
+    "get_data_moex",
+    "get_data_fred",
+    "get_dailysummary_iex",
+    "get_data_stooq",
+    "DataReader",
+    "Options",
+    "get_data_tiingo",
+    "get_iex_data_tiingo",
+    "get_data_alphavantage",
+]

pandas_datareader/_utils.py

@@ -34,7 +34,7 @@ def _sanitize_dates(start, end):
     if end is None:
         end = dt.datetime.today()
     if start > end:
-        raise ValueError('start must be an earlier date than end')
+        raise ValueError("start must be an earlier date than end")
     return start, end