Merge pull request #2 from hayd/travis

Travis working

Author: hayd

.travis.yml

@@ -5,6 +5,15 @@ env:
   - PYTHON=2.7 PANDAS=0.15.1
   - PYTHON=3.3 PANDAS=0.14.1
   - PYTHON=3.4 PANDAS=0.15.1
+  - PYTHON=2.7 PANDAS=0.12.0
+  - PYTHON=2.7 PANDAS=0.11.0
+  - PYTHON=2.7 PANDAS=0.10.1
+
+matrix:
+    allow_failures:
+        - env: PYTHON=2.7 PANDAS=0.12.0
+        - env: PYTHON=2.7 PANDAS=0.11.0
+        - env: PYTHON=2.7 PANDAS=0.10.1
 
 install:
   - sudo apt-get update
@@ -26,13 +35,13 @@ install:
   - conda info -a
 
   # Replace dep1 dep2 ... with your dependencies
-  - conda create -q -n test-environment python=$PYTHON pandas=$PANDAS nose coverage
+  - conda create -q -n test-environment python=$PYTHON pandas=$PANDAS nose coverage setuptools
   - source activate test-environment
   - conda list
   - python setup.py install
 
 script:
-  - nosetests --with-coverage --cover-package=pandas_data_readers
+  - nosetests --with-coverage --cover-package=pandas_datareader
 
 after_success:
   - coveralls

MANIFEST.in

@@ -1,6 +1,6 @@
 include README.md
 include LICENSE.md
-include pandas_data_readers/*.py
+include pandas_datareader/*.py
 
-include pandas_data_readers/tests/*.py
-include pandas_data_readers/tests/data/*
+include pandas_datareader/tests/*.py
+include pandas_datareader/tests/data/*

pandas_data_readers/__init__.py renamed to pandas_datareader/__init__.py

@@ -166,7 +166,7 @@ def _retry_read_url(url, retry_count, pause, name):
             pass
         else:
             rs = read_csv(StringIO(bytes_to_str(lines)), index_col=0,
-                          parse_dates=True)[::-1]
+                          parse_dates=True, na_values='-')[::-1]
             # Yahoo! Finance sometimes does this awesome thing where they
             # return 2 rows for the most recent business day
             if len(rs) > 2 and rs.index[-1] == rs.index[-2]:  # pragma: no cover

pandas_data_readers/data.py renamed to pandas_datareader/data.py

@@ -9,18 +9,23 @@
 import numpy as np
 import pandas as pd
 from pandas import DataFrame, Timestamp
-from pandas.util.testing import (assert_series_equal, assert_produces_warning,
-                                 network, assert_frame_equal)
+from pandas.util.testing import (assert_frame_equal, assert_series_equal,
+                                 network)
+try:
+    from pandas.util.testing import assert_produces_warning
+except ImportError:
+    assert_produces_warning = None
+
 import pandas.util.testing as tm
 from numpy.testing import assert_array_equal
 
-if compat.PY3:
+try:
     from urllib.error import HTTPError
-else:
+except ImportError:
     from urllib2 import HTTPError
 
-import pandas_data_readers.data as web
-from pandas_data_readers.data import (
+import pandas_datareader.data as web
+from pandas_datareader.data import (
     DataReader, SymbolWarning, RemoteDataError, _yahoo_codes)
 
 def _skip_if_no_lxml():
@@ -119,8 +124,8 @@ def test_get_multi2(self):
                 assert_n_failed_equals_n_null_columns(w, result)
 
     def test_dtypes(self):
-        #GH3995
-        data = web.get_data_google('MSFT', 'JAN-01-12', 'JAN-31-12')
+        #GH399, #GH8980
+        data = web.get_data_google('F', start='JAN-01-10', end='JAN-27-13')
         assert np.issubdtype(data.Open.dtype, np.number)
         assert np.issubdtype(data.Close.dtype, np.number)
         assert np.issubdtype(data.Low.dtype, np.number)
@@ -401,6 +406,9 @@ def tearDownClass(cls):
 
     @network
     def test_options_source_warning(self):
+        if not assert_produces_warning:
+            raise SkipTest("old version of pandas without "
+                           "compat.assert_produces_warning")
         with assert_produces_warning():
             aapl = web.Options('aapl')
 

pandas_data_readers/tests/data/banklist.csv renamed to pandas_datareader/tests/data/banklist.csv

@@ -1,13 +1,23 @@
 import nose
 
 import pandas
-from pandas.compat import u
 from pandas.util.testing import network
 from pandas.util.testing import assert_frame_equal
 from numpy.testing.decorators import slow
 import pandas.util.testing as tm
 
-from pandas_data_readers.wb import search, download, get_countries
+from pandas_datareader.wb import search, download, get_countries
+
+try:
+    from pandas.compat import u
+except ImportError:
+    try:
+        unicode # python 2
+        def u(s):
+            return unicode(s, "unicode_escape")
+    except NameError:
+        def u(s):
+            return s
 
 
 class TestWB(tm.TestCase):
@@ -41,10 +51,14 @@ def test_wdi_download(self):
 
         expected = {'NY.GDP.PCAP.CD': {('Canada', '2003'): 28026.006013044702, ('Mexico', '2003'): 6601.0420648056606, ('Canada', '2004'): 31829.522562759001, ('Kosovo', '2003'): 1969.56271307405, ('Mexico', '2004'): 7042.0247834044303, ('United States', '2004'): 41928.886136479705, ('United States', '2003'): 39682.472247320402, ('Kosovo', '2004'): 2135.3328465238301}}
         expected = pandas.DataFrame(expected)
+        # Round, to ignore revisions to data.
+        expected = pandas.np.round(expected,decimals=-3)
         expected.sort(inplace=True)
         result = download(country=cntry_codes, indicator=inds,
                           start=2003, end=2004, errors='ignore')
         result.sort(inplace=True)
+        # Round, to ignore revisions to data.
+        result = pandas.np.round(result,decimals=-3)
         expected.index = result.index
         assert_frame_equal(result, pandas.DataFrame(expected))
 

pandas_data_readers/tests/data/banklist.html renamed to pandas_datareader/tests/data/banklist.html

@@ -6,13 +6,13 @@
 from setuptools import setup
 
 
-NAME = 'pandas_data_readers'
+NAME = 'pandas_datareader'
 
 
 def version():
     """Return version string."""
     with open(os.path.join(os.path.abspath(os.path.dirname(__file__)),
-                           'pandas_data_readers',
+                           'pandas_datareader',
                            '__init__.py')) as input_file:
         for line in input_file:
             if line.startswith('__version__'):
@@ -36,7 +36,7 @@ def readme():
     license='MIT License',
     author='Andy Hayden',
     author_email='[email protected]',
-    url='https://github.com/hayd/pandas_data_readers',
+    url='https://github.com/pydata/pandas_datareader',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Operating System :: OS Independent',
@@ -51,7 +51,7 @@ def readme():
     ],
     keywords='data',
     install_requires=INSTALL_REQUIRES,
-    packages=['pandas_data_readers'],
+    packages=['pandas_datareader'],
     test_suite='tests',
     zip_safe=False,
 )