Update math/py-pandas to 0.21.0

PR:		223849
Submitted by:	John W. O'Brien <john@saltant.com> (maintainer)

2 files changed, 0 insertions, 83 deletions

diff --git a/math/py-pandas/files/patch-pandas_tests_io_test__html.py b/math/py-pandas/files/patch-pandas_tests_io_test__html.py
deleted file mode 100644
index 8950fb711746..000000000000
--- a/math/py-pandas/files/patch-pandas_tests_io_test__html.py
+++ /dev/null
@@ -1,62 +0,0 @@
-Reported upstream
-
-Various py3k test failures in tests.io.test_html with US-ASCII
-preferred encoding
-https://github.com/pandas-dev/pandas/issues/16525
-
---- pandas/tests/io/test_html.py.orig	2017-05-04 14:53:46 UTC
-+++ pandas/tests/io/test_html.py
-@@ -20,7 +20,7 @@ from numpy.random import rand
- from pandas import (DataFrame, MultiIndex, read_csv, Timestamp, Index,
-                     date_range, Series)
- from pandas.compat import (map, zip, StringIO, string_types, BytesIO,
--                           is_platform_windows)
-+                           is_platform_windows, PY3)
- from pandas.io.common import URLError, urlopen, file_path_to_url
- from pandas.io.html import read_html
- from pandas._libs.parsers import ParserError
-@@ -96,6 +96,9 @@ class ReadHtmlMixin(object):
- class TestReadHtml(ReadHtmlMixin):
-     flavor = 'bs4'
-     spam_data = os.path.join(DATA_PATH, 'spam.html')
-+    spam_data_kwargs = {}
-+    if PY3:
-+        spam_data_kwargs['encoding'] = 'UTF-8'
-     banklist_data = os.path.join(DATA_PATH, 'banklist.html')
- 
-     @classmethod
-@@ -247,10 +250,10 @@ class TestReadHtml(ReadHtmlMixin):
-         assert_framelist_equal(df1, df2)
- 
-     def test_string_io(self):
--        with open(self.spam_data) as f:
-+        with open(self.spam_data, **self.spam_data_kwargs) as f:
-             data1 = StringIO(f.read())
- 
--        with open(self.spam_data) as f:
-+        with open(self.spam_data, **self.spam_data_kwargs) as f:
-             data2 = StringIO(f.read())
- 
-         df1 = self.read_html(data1, '.*Water.*')
-@@ -258,7 +261,7 @@ class TestReadHtml(ReadHtmlMixin):
-         assert_framelist_equal(df1, df2)
- 
-     def test_string(self):
--        with open(self.spam_data) as f:
-+        with open(self.spam_data, **self.spam_data_kwargs) as f:
-             data = f.read()
- 
-         df1 = self.read_html(data, '.*Water.*')
-@@ -267,10 +270,10 @@ class TestReadHtml(ReadHtmlMixin):
-         assert_framelist_equal(df1, df2)
- 
-     def test_file_like(self):
--        with open(self.spam_data) as f:
-+        with open(self.spam_data, **self.spam_data_kwargs) as f:
-             df1 = self.read_html(f, '.*Water.*')
- 
--        with open(self.spam_data) as f:
-+        with open(self.spam_data, **self.spam_data_kwargs) as f:
-             df2 = self.read_html(f, 'Unit')
- 
-         assert_framelist_equal(df1, df2)
diff --git a/math/py-pandas/files/patch-pandas_tests_io_test__sql.py b/math/py-pandas/files/patch-pandas_tests_io_test__sql.py
deleted file mode 100644
index bc3b88393b08..000000000000
--- a/math/py-pandas/files/patch-pandas_tests_io_test__sql.py
+++ /dev/null
@@ -1,21 +0,0 @@
-Reported upstream
-
-TestSQLApi/TestSQLApiConn::test_database_uri_string errors if pg8000
-is installed
-https://github.com/pandas-dev/pandas/issues/16527
-
---- pandas/tests/io/test_sql.py.orig	2017-05-28 19:28:19 UTC
-+++ pandas/tests/io/test_sql.py
-@@ -938,6 +938,12 @@ class TestSQLApi(SQLAlchemyMixIn, _TestS
- 
-         # using driver that will not be installed on Travis to trigger error
-         # in sqlalchemy.create_engine -> test passing of this error to user
-+        try:
-+            import pg8000
-+            pytest.skip("pg8000 is installed")
-+        except ImportError:
-+            pass
-+
-         db_uri = "postgresql+pg8000://user:pass@host/dbname"
-         with tm.assert_raises_regex(ImportError, "pg8000"):
-             sql.read_sql("select * from table", db_uri)