diff options
author | tcberner <tcberner@FreeBSD.org> | 2017-11-26 02:39:42 +0800 |
---|---|---|
committer | Koop Mast <kwm@rainbow-runner.nl> | 2018-02-04 06:00:44 +0800 |
commit | 58ddd600f85e57b8fcd4257d8055d69f1eddd766 (patch) | |
tree | a7a50c8c555ff8291e246bdac65e8b0c146631a5 | |
parent | af700b39fd4e2bf66a9a219e003af8bb2ec2b6be (diff) | |
download | freebsd-ports-gnome-58ddd600f85e57b8fcd4257d8055d69f1eddd766.tar.gz freebsd-ports-gnome-58ddd600f85e57b8fcd4257d8055d69f1eddd766.tar.zst freebsd-ports-gnome-58ddd600f85e57b8fcd4257d8055d69f1eddd766.zip |
Update math/py-pandas to 0.21.0
PR: 223849
Submitted by: John W. O'Brien <john@saltant.com> (maintainer)
-rw-r--r-- | math/py-pandas/Makefile | 3 | ||||
-rw-r--r-- | math/py-pandas/distinfo | 6 | ||||
-rw-r--r-- | math/py-pandas/files/patch-pandas_tests_io_test__html.py | 62 | ||||
-rw-r--r-- | math/py-pandas/files/patch-pandas_tests_io_test__sql.py | 21 |
4 files changed, 5 insertions, 87 deletions
diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile index ed208f2c761e..5236367eb387 100644 --- a/math/py-pandas/Makefile +++ b/math/py-pandas/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pandas -PORTVERSION= 0.20.1 +DISTVERSION= 0.21.0 CATEGORIES= math devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -94,6 +94,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup SUB_FILES= pkg-message +# Official support for 2.7, 3.5, and 3.6 USES= python USE_PYTHON= autoplist distutils diff --git a/math/py-pandas/distinfo b/math/py-pandas/distinfo index ae69db771d97..7c03b8679ab7 100644 --- a/math/py-pandas/distinfo +++ b/math/py-pandas/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495907492 -SHA256 (pandas-0.20.1.tar.gz) = 42707365577ef69f7c9c168ddcf045df2957595a9ee71bc13c7997eecb96b190 -SIZE (pandas-0.20.1.tar.gz) = 10307434 +TIMESTAMP = 1509894581 +SHA256 (pandas-0.21.0.tar.gz) = 5cd5cb30e72eeaf202f0e5e180780b897570e889d2db328c689a5a263405c559 +SIZE (pandas-0.21.0.tar.gz) = 11266258 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) |