From owner-svn-ports-all@freebsd.org Wed Mar 9 19:34:05 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D605ACA1D4; Wed, 9 Mar 2016 19:34:05 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0FBB81FB5; Wed, 9 Mar 2016 19:34:04 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u29JY47Z035075; Wed, 9 Mar 2016 19:34:04 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u29JY3L2035072; Wed, 9 Mar 2016 19:34:03 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201603091934.u29JY3L2035072@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 9 Mar 2016 19:34:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410722 - in head: math/py-pandas textproc/py-openpyxl1 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2016 19:34:05 -0000 Author: antoine Date: Wed Mar 9 19:34:03 2016 New Revision: 410722 URL: https://svnweb.freebsd.org/changeset/ports/410722 Log: - Remove OPENPYXL1 option from py-pandas - Set an EXPIRATION_DATE for py-openpyxl1 (deprecated since May 2014) Modified: head/math/py-pandas/Makefile head/textproc/py-openpyxl1/Makefile Modified: head/math/py-pandas/Makefile ============================================================================== --- head/math/py-pandas/Makefile Wed Mar 9 19:10:34 2016 (r410721) +++ head/math/py-pandas/Makefile Wed Mar 9 19:34:03 2016 (r410722) @@ -35,14 +35,12 @@ TEST_DEPENDS:= ${RUN_DEPENDS} \ # Note: we cannot include math/py-statsmodels in TEST_DEPENDS because it # depends upon us for BUILD and RUN. -OPTIONS_DEFINE= MPL SCIPY +OPTIONS_DEFINE= MPL OPENPYXL SCIPY OPTIONS_GROUP= ACCEL STORAGE HTML EXCEL OPTIONS_GROUP_ACCEL= BTLNCK NUMEXPR OPTIONS_GROUP_STORAGE= BOTO TABLES SQL OPTIONS_GROUP_HTML= LXML HTML5LIB OPTIONS_GROUP_EXCEL= XLRD XLWT -OPTIONS_RADIO= OPYXL -OPTIONS_RADIO_OPYXL= OPENPYXL1 OPENPYXL2 OPTIONS_DEFAULT= BTLNCK NUMEXPR MPL_DESC= Support graphical plotting output via math/py-matplotlib @@ -54,15 +52,13 @@ TABLES_DESC= Support HDF5-based storage SQL_DESC= Support SQL databases via databases/py-sqlalchemy LXML_DESC= Parse HTML with devel/py-lxml and www/py-beautifulsoup HTML5LIB_DESC= Parse HTML with www/py-html5lib and www/py-beautifulsoup -OPENPYXL1_DESC= Read/write MS Excel 2007+ with textproc/py-openpyxl1 -OPENPYXL2_DESC= Read/write MS Excel 2007+ with textproc/py-openpyxl (EXPERIMENTAL) +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 ACCEL_DESC= Computation Acceleration Add-ons STORAGE_DESC= Data Storage Add-ons HTML_DESC= HTML Parsing Add-ons EXCEL_DESC= MS Excel I/O Add-ons -OPYXL_DESC= MS Excel I/O Add-ons (openpyxl alternatives) MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:${PORTSDIR}/science/py-scipy @@ -74,8 +70,7 @@ SQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX} LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib -OPENPYXL1_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl1<2.0.0:${PORTSDIR}/textproc/py-openpyxl1 -OPENPYXL2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.0.0:${PORTSDIR}/textproc/py-openpyxl +OPENPYXL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.0.0:${PORTSDIR}/textproc/py-openpyxl XLRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>0:${PORTSDIR}/textproc/py-xlrd XLWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlwt>0:${PORTSDIR}/textproc/py-xlwt Modified: head/textproc/py-openpyxl1/Makefile ============================================================================== --- head/textproc/py-openpyxl1/Makefile Wed Mar 9 19:10:34 2016 (r410721) +++ head/textproc/py-openpyxl1/Makefile Wed Mar 9 19:34:03 2016 (r410722) @@ -14,6 +14,7 @@ COMMENT= Python library to read/write Ex LICENSE= MIT DEPRECATED= Use textproc/py-openpyxl instead +EXPIRATION_DATE= 2016-04-10 CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}openpyxl-[0-9]* USES= python