Merge pull request #677 from gliptak/alpha1

Correct AlphaVantage data source

Author: bashtage

pandas_datareader/av/__init__.py

@@ -60,7 +60,7 @@ def _read_lines(self, out):
         except KeyError:
             if "Error Message" in out:
                 raise ValueError("The requested symbol {} could not be "
-                                 "retrived. Check valid ticker"
+                                 "retrieved. Check valid ticker"
                                  ".".format(self.symbols))
             else:
                 raise RemoteDataError()

pandas_datareader/tests/av/test_av_forex.py

@@ -32,7 +32,7 @@ def test_bad_pairs_format(self):
     @pytest.mark.skipif(TEST_API_KEY is None,
                         reason="ALPHAVANTAGE_API_KEY not set")
     def test_one_pair(self):
-        df = web.DataReader("USD/EUR", "av-forex")
+        df = web.DataReader("USD/EUR", "av-forex", retry_count=6, pause=20.5)
         assert isinstance(df, pd.DataFrame)
         assert df.loc["To_Currency Name"][0] == "Euro"
         assert df.loc["Time Zone"][0] == 'UTC'
@@ -41,6 +41,6 @@ def test_one_pair(self):
                         reason="ALPHAVANTAGE_API_KEY not set")
     def test_multiple_pairs(self):
         pairs = ["USD/JPY", "EUR/JPY"]
-        df = web.DataReader(pairs, "av-forex")
+        df = web.DataReader(pairs, "av-forex", retry_count=6, pause=20.5)
         assert isinstance(df, pd.DataFrame)
         assert df.columns.equals(pd.Index(pairs))

pandas_datareader/tests/av/test_av_quotes.py

@@ -33,7 +33,7 @@ def test_bad_multiple_symbol(self):
     @pytest.mark.skipif(TEST_API_KEY is None,
                         reason="ALPHAVANTAGE_API_KEY not set")
     def test_single_symbol(self):
-        df = web.get_quote_av("AAPL")
+        df = web.get_quote_av("AAPL", retry_count=6, pause=20.5)
         assert len(df) == 1
 
         expected = pd.Index(["price", "volume", "timestamp"])
@@ -42,7 +42,7 @@ def test_single_symbol(self):
     @pytest.mark.skipif(TEST_API_KEY is None,
                         reason="ALPHAVANTAGE_API_KEY not set")
     def test_multi_symbol(self):
-        df = web.get_quote_av(["AAPL", "TSLA"])
+        df = web.get_quote_av(["AAPL", "TSLA"], retry_count=6, pause=20.5)
         assert len(df) == 2
 
         expected = pd.Index(["price", "volume", "timestamp"])
@@ -52,7 +52,7 @@ def test_multi_symbol(self):
                         reason="ALPHAVANTAGE_API_KEY not set")
     @pytest.mark.xfail(reason="May return NaN outside of market hours")
     def test_return_types(self):
-        df = web.get_quote_av("AAPL")
+        df = web.get_quote_av("AAPL", retry_count=6, pause=20.5)
 
         assert isinstance(df["AAPL"]["price"], np.int64)
         assert isinstance(df["AAPL"]["volume"], np.float64)

pandas_datareader/tests/av/test_av_sector.py

@@ -20,7 +20,7 @@ def setup_class(cls):
     @pytest.mark.skipif(TEST_API_KEY is None,
                         reason="ALPHAVANTAGE_API_KEY not set")
     def test_sector(self):
-        df = get_sector_performance_av()
+        df = get_sector_performance_av(retry_count=6, pause=20.5)
 
         cols = pd.Index(["RT", "1D", "5D", "1M", "3M", "YTD", "1Y", "3Y", "5Y",
                          "10Y"])

pandas_datareader/tests/av/test_av_time_series.py

@@ -36,10 +36,11 @@ def end(self):
     def test_av_bad_symbol(self):
         with pytest.raises((ValueError, RemoteDataError)):
             web.DataReader("BADTICKER", "av-daily", start=self.start,
-                           end=self.end)
+                           end=self.end, retry_count=6, pause=20.5)
 
     def test_av_daily(self):
-        df = web.DataReader("AAPL", "av-daily", start=self.start, end=self.end)
+        df = web.DataReader("AAPL", "av-daily", start=self.start,
+                            end=self.end, retry_count=6, pause=20.5)
         assert df.columns.equals(self.col_index)
         assert len(df) == 578
         assert df["volume"][-1] == 19178000
@@ -54,7 +55,7 @@ def test_av_daily(self):
 
     def test_av_daily_adjusted(self):
         df = web.DataReader("AAPL", "av-daily-adjusted", start=self.start,
-                            end=self.end)
+                            end=self.end, retry_count=6, pause=20.5)
         assert df.columns.equals(pd.Index(["open", "high", "low", "close",
                                            "adjusted close", "volume",
                                            "dividend amount",
@@ -87,7 +88,7 @@ def _helper_df_weekly_monthly(df, adj=False):
 
     def test_av_weekly(self):
         df = web.DataReader("AAPL", "av-weekly", start=self.start,
-                            end=self.end)
+                            end=self.end, retry_count=6, pause=20.5)
 
         assert len(df) == 119
         assert df.iloc[0].name == '2015-02-13'
@@ -97,7 +98,7 @@ def test_av_weekly(self):
 
     def test_av_weekly_adjusted(self):
         df = web.DataReader("AAPL", "av-weekly-adjusted", start=self.start,
-                            end=self.end)
+                            end=self.end, retry_count=6, pause=20.5)
 
         assert len(df) == 119
         assert df.iloc[0].name == '2015-02-13'
@@ -107,7 +108,7 @@ def test_av_weekly_adjusted(self):
 
     def test_av_monthly(self):
         df = web.DataReader("AAPL", "av-monthly", start=self.start,
-                            end=self.end)
+                            end=self.end, retry_count=6, pause=20.5)
 
         assert len(df) == 27
         assert df.iloc[0].name == '2015-02-27'
@@ -117,7 +118,7 @@ def test_av_monthly(self):
 
     def test_av_monthly_adjusted(self):
         df = web.DataReader("AAPL", "av-monthly-adjusted", start=self.start,
-                            end=self.end)
+                            end=self.end, retry_count=6, pause=20.5)
 
         assert df.columns.equals(self.col_index_adj)
         assert len(df) == 27
@@ -127,7 +128,7 @@ def test_av_monthly_adjusted(self):
 
     def test_av_intraday(self):
         # Not much available to test, but ensure close in length
-        df = web.DataReader("AAPL", "av-intraday")
+        df = web.DataReader("AAPL", "av-intraday", retry_count=6, pause=20.5)
 
         assert len(df) > 1000
         assert 'open' in df.columns