Index: head/math/py-pandas/Makefile =================================================================== --- head/math/py-pandas/Makefile (revision 459179) +++ head/math/py-pandas/Makefile (revision 459180) @@ -1,88 +1,88 @@ # $FreeBSD$ PORTNAME= pandas -DISTVERSION= 0.21.1 +DISTVERSION= 0.22.0 CATEGORIES= math devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= john@saltant.com COMMENT= Flexible, high-performance data analysis in Python LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS:= ${BUILD_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} OPTIONS_DEFINE= MPL SCIPY OPTIONS_GROUP= ACCEL STORAGE HTML EXCEL OPTIONS_RADIO= SQL OPTIONS_GROUP_ACCEL= BTLNCK NUMEXPR OPTIONS_GROUP_STORAGE= BOTO TABLES OPTIONS_GROUP_HTML= LXML HTML5LIB JINJA2 OPTIONS_GROUP_EXCEL= XLRD XLWT OPENPYXL XLSX OPTIONS_RADIO_SQL= ALCHEMY10 ALCHEMY11 OPTIONS_DEFAULT= BTLNCK NUMEXPR # Note: we cannot include math/py-statsmodels in *_DEPENDS because it # depends upon us for BUILD and RUN. MPL_DESC= Support graphical plotting output via math/py-matplotlib SCIPY_DESC= Support various statistical functions via science/py-scipy BTLNCK_DESC= Accelerate certain NaN evals via math/py-bottleneck NUMEXPR_DESC= Accelerate certain numerical ops via math/py-numexpr BOTO_DESC= Support Amazon S3 storage via devel/py-boto TABLES_DESC= Support HDF5-based storage via devel/py-tables LXML_DESC= Parse HTML with devel/py-lxml and www/py-beautifulsoup JINJA2_DESC= Support conditional HTML formatting with devel/py-Jinja2 HTML5LIB_DESC= Parse HTML with www/py-html5lib and www/py-beautifulsoup OPENPYXL_DESC= Read/write MS Excel 2007+ with textproc/py-openpyxl XLRD_DESC= Read MS Excel with textproc/py-xlrd XLWT_DESC= Write MS Excel with textproc/py-xlwt XLSX_DESC= Write MS Excel with textproc/py-xlsxwriter ALCHEMY10_DESC= Support SQL databases via databases/py-sqlalchemy10 ALCHEMY11_DESC= Support SQL databases via databases/py-sqlalchemy11 ACCEL_DESC= Computation Acceleration Add-ons STORAGE_DESC= Data Storage Add-ons SQL_DESC= SQLAlchemy ORM Add-ons HTML_DESC= HTML Parsing/Generation Add-ons EXCEL_DESC= MS Excel I/O Add-ons -MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} -SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} -BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck@${FLAVOR} +MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>1.4.3:math/py-matplotlib@${FLAVOR} +SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0.14.0:science/py-scipy@${FLAVOR} +BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottleneck>1.0.0:math/py-bottleneck@${FLAVOR} NUMEXPR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr@${FLAVOR} BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} TABLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables@${FLAVOR} LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${FLAVOR} JINJA2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} OPENPYXL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl@${FLAVOR} XLRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd@${FLAVOR} XLWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${FLAVOR} XLSX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${FLAVOR} ALCHEMY10_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} ALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11@${FLAVOR} .include .if ${PORT_OPTIONS:MLXML} || ${PORT_OPTIONS:MHTML5LIB} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${FLAVOR} .endif SUB_FILES= pkg-message # Official support for 2.7, 3.5, and 3.6 USES= python USE_PYTHON= autoplist distutils post-install: @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \ -name '*.so' -exec ${STRIP_CMD} {} + .include Index: head/math/py-pandas/distinfo =================================================================== --- head/math/py-pandas/distinfo (revision 459179) +++ head/math/py-pandas/distinfo (revision 459180) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514141635 -SHA256 (pandas-0.21.1.tar.gz) = c5f5cba88bf0659554c41c909e1f78139f6fce8fa9315a29a23692b38ff9788a -SIZE (pandas-0.21.1.tar.gz) = 11288319 +TIMESTAMP = 1516038682 +SHA256 (pandas-0.22.0.tar.gz) = 44a94091dd71f05922eec661638ec1a35f26d573c119aa2fad964f10a2880e6c +SIZE (pandas-0.22.0.tar.gz) = 11297071 Index: head/math/py-pandas/files/patch-GH18719 =================================================================== --- head/math/py-pandas/files/patch-GH18719 (nonexistent) +++ head/math/py-pandas/files/patch-GH18719 (revision 459180) @@ -0,0 +1,61 @@ +commit c753e1e08b01a438aaa252327de046109bf4bcfd +Author: Joris Van den Bossche +Date: Mon Dec 11 11:57:00 2017 +0100 + + TST: make it possible to run tests without moto installed (#18719) + +diff pandas/tests/io/conftest.py pandas/tests/io/conftest.py +--- pandas/tests/io/conftest.py.orig 2017-12-11 10:57:00 UTC ++++ pandas/tests/io/conftest.py +@@ -1,6 +1,5 @@ + import os + +-import moto + import pytest + from pandas.io.parsers import read_table + +@@ -42,6 +41,7 @@ def s3_resource(tips_file, jsonl_file): + is yielded by the fixture. + """ + pytest.importorskip('s3fs') ++ moto = pytest.importorskip('moto') + moto.mock_s3().start() + + test_s3_files = [ +diff pandas/tests/io/json/test_compression.py pandas/tests/io/json/test_compression.py +--- pandas/tests/io/json/test_compression.py.orig 2017-12-11 10:57:00 UTC ++++ pandas/tests/io/json/test_compression.py +@@ -1,5 +1,4 @@ + import pytest +-import moto + + import pandas as pd + from pandas import compat +@@ -73,6 +72,8 @@ def test_read_zipped_json(): + def test_with_s3_url(compression): + boto3 = pytest.importorskip('boto3') + pytest.importorskip('s3fs') ++ moto = pytest.importorskip('moto') ++ + if compression == 'xz': + tm._skip_if_no_lzma() + +diff pandas/tests/io/test_excel.py pandas/tests/io/test_excel.py +--- pandas/tests/io/test_excel.py.orig 2017-12-11 10:57:00 UTC ++++ pandas/tests/io/test_excel.py +@@ -10,7 +10,6 @@ from warnings import catch_warnings + import numpy as np + import pytest + from numpy import nan +-import moto + + import pandas as pd + import pandas.util.testing as tm +@@ -616,6 +615,7 @@ class XlrdTests(ReadingTestsBase): + def test_read_from_s3_url(self): + boto3 = pytest.importorskip('boto3') + pytest.importorskip('s3fs') ++ moto = pytest.importorskip('moto') + + with moto.mock_s3(): + conn = boto3.resource("s3", region_name="us-east-1") Property changes on: head/math/py-pandas/files/patch-GH18719 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property