Received: by mail.netbsd.org (Postfix, from userid 605) id DAE3684D6B; Fri, 9 Apr 2021 14:41:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2097484D6A for ; Fri, 9 Apr 2021 14:41:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 2nsqxgn5jaGZ for ; Fri, 9 Apr 2021 14:41:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 18E4984D5E for ; Fri, 9 Apr 2021 14:41:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 120D6FA95; Fri, 9 Apr 2021 14:41:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1617979296215490" MIME-Version: 1.0 Date: Fri, 9 Apr 2021 14:41:36 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20210409144136.120D6FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1617979296215490 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Fri Apr 9 14:41:35 UTC 2021 Modified Files: pkgsrc/finance/py-empyrical: Makefile pkgsrc/finance/py-pyfolio: Makefile pkgsrc/geography/py-obspy: Makefile pkgsrc/graphics/py-matplotlib-venn: Makefile pkgsrc/graphics/py-seaborn: Makefile pkgsrc/math/py-Theano: Makefile pkgsrc/math/py-abcpmc: Makefile pkgsrc/math/py-arviz: Makefile pkgsrc/math/py-lmfit: Makefile pkgsrc/math/py-pandas: Makefile pkgsrc/math/py-powerlaw: Makefile pkgsrc/math/py-pymc3: Makefile pkgsrc/math/py-scikit-learn: Makefile pkgsrc/math/py-scipy: Makefile Log Message: revert wrong fix for py-scipy python 3.6 deprecation, fix properly To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/finance/py-empyrical/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/finance/py-pyfolio/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/geography/py-obspy/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/py-matplotlib-venn/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/py-seaborn/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/py-Theano/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-abcpmc/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-arviz/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/math/py-lmfit/Makefile cvs rdiff -u -r1.31 -r1.32 pkgsrc/math/py-pandas/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-powerlaw/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/py-pymc3/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/math/py-scikit-learn/Makefile cvs rdiff -u -r1.46 -r1.47 pkgsrc/math/py-scipy/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1617979296215490 Content-Disposition: inline Content-Length: 10090 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/finance/py-empyrical/Makefile diff -u pkgsrc/finance/py-empyrical/Makefile:1.2 pkgsrc/finance/py-empyrical/Makefile:1.3 --- pkgsrc/finance/py-empyrical/Makefile:1.2 Mon Jun 17 15:24:34 2019 +++ pkgsrc/finance/py-empyrical/Makefile Fri Apr 9 14:41:34 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/06/17 15:24:34 adam Exp $ +# $NetBSD: Makefile,v 1.3 2021/04/09 14:41:34 tnn Exp $ DISTNAME= empyrical-0.5.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,7 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-scipy>=0.15.1:. USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-scipy +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-scipy .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/finance/py-pyfolio/Makefile diff -u pkgsrc/finance/py-pyfolio/Makefile:1.2 pkgsrc/finance/py-pyfolio/Makefile:1.3 --- pkgsrc/finance/py-pyfolio/Makefile:1.2 Mon Jun 17 15:31:09 2019 +++ pkgsrc/finance/py-pyfolio/Makefile Fri Apr 9 14:41:34 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/06/17 15:31:09 adam Exp $ +# $NetBSD: Makefile,v 1.3 2021/04/09 14:41:34 tnn Exp $ DISTNAME= pyfolio-0.9.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -26,7 +26,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-nose>=1.3. USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-matplotlib, py-scipy +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-matplotlib, py-scipy .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/geography/py-obspy/Makefile diff -u pkgsrc/geography/py-obspy/Makefile:1.17 pkgsrc/geography/py-obspy/Makefile:1.18 --- pkgsrc/geography/py-obspy/Makefile:1.17 Sat Jan 2 10:06:04 2021 +++ pkgsrc/geography/py-obspy/Makefile Fri Apr 9 14:41:34 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2021/01/02 10:06:04 mef Exp $ +# $NetBSD: Makefile,v 1.18 2021/04/09 14:41:34 tnn Exp $ DISTNAME= obspy-1.2.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -24,7 +24,7 @@ USE_TOOLS+= bash:run REPLACE_BASH= obspy/taup/tests/data/TauP_test_data/gendata.sh -PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-scipy +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-scipy pre-configure: ${FIND} ${WRKSRC} -type f -exec ${CHMOD} -x {} \; Index: pkgsrc/graphics/py-matplotlib-venn/Makefile diff -u pkgsrc/graphics/py-matplotlib-venn/Makefile:1.1 pkgsrc/graphics/py-matplotlib-venn/Makefile:1.2 --- pkgsrc/graphics/py-matplotlib-venn/Makefile:1.1 Tue Nov 26 21:08:26 2019 +++ pkgsrc/graphics/py-matplotlib-venn/Makefile Fri Apr 9 14:41:34 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/11/26 21:08:26 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2021/04/09 14:41:34 tnn Exp $ DISTNAME= matplotlib-venn-0.11.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,7 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-matplotlib-[0-9 DEPENDS+= ${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy DEPENDS+= ${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy -PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-scipy .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/graphics/py-seaborn/Makefile diff -u pkgsrc/graphics/py-seaborn/Makefile:1.5 pkgsrc/graphics/py-seaborn/Makefile:1.6 --- pkgsrc/graphics/py-seaborn/Makefile:1.5 Sun Jan 26 17:31:23 2020 +++ pkgsrc/graphics/py-seaborn/Makefile Fri Apr 9 14:41:34 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2020/01/26 17:31:23 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2021/04/09 14:41:34 tnn Exp $ DISTNAME= seaborn-0.9.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,7 @@ DEPENDS+= ${PYPKGPREFIX}-scipy>=0.14.0:. USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-matplotlib, py-scipy +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-matplotlib, py-scipy .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/py-Theano/Makefile diff -u pkgsrc/math/py-Theano/Makefile:1.6 pkgsrc/math/py-Theano/Makefile:1.7 --- pkgsrc/math/py-Theano/Makefile:1.6 Mon Oct 12 21:52:02 2020 +++ pkgsrc/math/py-Theano/Makefile Fri Apr 9 14:41:34 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2020/10/12 21:52:02 bacon Exp $ +# $NetBSD: Makefile,v 1.7 2021/04/09 14:41:34 tnn Exp $ DISTNAME= Theano-1.0.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -26,7 +26,7 @@ REPLACE.bash.old= .*/bin/bash REPLACE.bash.new= ${SH} REPLACE_FILES.bash= theano/misc/check_blas_many.sh -PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-scipy +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-scipy post-install: cd ${DESTDIR}${PREFIX}/bin && \ Index: pkgsrc/math/py-abcpmc/Makefile diff -u pkgsrc/math/py-abcpmc/Makefile:1.4 pkgsrc/math/py-abcpmc/Makefile:1.5 --- pkgsrc/math/py-abcpmc/Makefile:1.4 Sat Jun 15 06:55:51 2019 +++ pkgsrc/math/py-abcpmc/Makefile Fri Apr 9 14:41:34 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/06/15 06:55:51 adam Exp $ +# $NetBSD: Makefile,v 1.5 2021/04/09 14:41:34 tnn Exp $ DISTNAME= abcpmc-0.1.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -20,7 +20,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-six-[0-9]* USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-scipy +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-scipy .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/py-arviz/Makefile diff -u pkgsrc/math/py-arviz/Makefile:1.4 pkgsrc/math/py-arviz/Makefile:1.5 --- pkgsrc/math/py-arviz/Makefile:1.4 Wed Jul 1 16:03:59 2020 +++ pkgsrc/math/py-arviz/Makefile Fri Apr 9 14:41:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/07/01 16:03:59 adam Exp $ +# $NetBSD: Makefile,v 1.5 2021/04/09 14:41:35 tnn Exp $ DISTNAME= arviz-0.9.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -20,7 +20,7 @@ DEPENDS+= ${PYPKGPREFIX}-xarray>=0.11:.. USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-scipy .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/py-lmfit/Makefile diff -u pkgsrc/math/py-lmfit/Makefile:1.10 pkgsrc/math/py-lmfit/Makefile:1.11 --- pkgsrc/math/py-lmfit/Makefile:1.10 Wed May 13 15:36:27 2020 +++ pkgsrc/math/py-lmfit/Makefile Fri Apr 9 14:41:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2020/05/13 15:36:27 adam Exp $ +# $NetBSD: Makefile,v 1.11 2021/04/09 14:41:35 tnn Exp $ DISTNAME= lmfit-1.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,7 @@ DEPENDS+= ${PYPKGPREFIX}-uncertainties>= USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-scipy .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/py-pandas/Makefile diff -u pkgsrc/math/py-pandas/Makefile:1.31 pkgsrc/math/py-pandas/Makefile:1.32 --- pkgsrc/math/py-pandas/Makefile:1.31 Mon Oct 12 21:52:03 2020 +++ pkgsrc/math/py-pandas/Makefile Fri Apr 9 14:41:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2020/10/12 21:52:03 bacon Exp $ +# $NetBSD: Makefile,v 1.32 2021/04/09 14:41:35 tnn Exp $ DISTNAME= pandas-0.25.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -29,7 +29,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist USE_LANGUAGES= c c++ -PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-scipy PYSETUPTESTTARGET= pytest Index: pkgsrc/math/py-powerlaw/Makefile diff -u pkgsrc/math/py-powerlaw/Makefile:1.4 pkgsrc/math/py-powerlaw/Makefile:1.5 --- pkgsrc/math/py-powerlaw/Makefile:1.4 Sun Jun 16 19:22:59 2019 +++ pkgsrc/math/py-powerlaw/Makefile Fri Apr 9 14:41:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/06/16 19:22:59 adam Exp $ +# $NetBSD: Makefile,v 1.5 2021/04/09 14:41:35 tnn Exp $ DISTNAME= powerlaw-1.4.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,7 @@ DEPENDS+= ${PYPKGPREFIX}-scipy-[0-9]*:.. USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-matplotlib, py-scipy +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-matplotlib, py-scipy .include "../../devel/py-cython/buildlink3.mk" .include "../../lang/python/egg.mk" Index: pkgsrc/math/py-pymc3/Makefile diff -u pkgsrc/math/py-pymc3/Makefile:1.3 pkgsrc/math/py-pymc3/Makefile:1.4 --- pkgsrc/math/py-pymc3/Makefile:1.3 Sun Jun 16 19:17:23 2019 +++ pkgsrc/math/py-pymc3/Makefile Fri Apr 9 14:41:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/06/16 19:17:23 adam Exp $ +# $NetBSD: Makefile,v 1.4 2021/04/09 14:41:35 tnn Exp $ DISTNAME= pymc3-3.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -19,7 +19,7 @@ DEPENDS+= ${PYPKGPREFIX}-patsy>=0.4.0:.. DEPENDS+= ${PYPKGPREFIX}-scipy>=0.18.1:../../math/py-scipy DEPENDS+= ${PYPKGPREFIX}-tqdm>=4.8.4:../../misc/py-tqdm -PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-matplotlib, py-scipy +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-matplotlib, py-scipy .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/py-scikit-learn/Makefile diff -u pkgsrc/math/py-scikit-learn/Makefile:1.12 pkgsrc/math/py-scikit-learn/Makefile:1.13 --- pkgsrc/math/py-scikit-learn/Makefile:1.12 Mon Oct 12 21:52:04 2020 +++ pkgsrc/math/py-scikit-learn/Makefile Fri Apr 9 14:41:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2020/10/12 21:52:04 bacon Exp $ +# $NetBSD: Makefile,v 1.13 2021/04/09 14:41:35 tnn Exp $ DISTNAME= scikit-learn-0.22.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -20,7 +20,7 @@ MAKE_ENV+= SKLEARN_NO_OPENMP=1 USE_LANGUAGES= c c++ fortran -PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 # py-scipy .include "../../devel/py-cython/buildlink3.mk" .include "../../lang/python/egg.mk" Index: pkgsrc/math/py-scipy/Makefile diff -u pkgsrc/math/py-scipy/Makefile:1.46 pkgsrc/math/py-scipy/Makefile:1.47 --- pkgsrc/math/py-scipy/Makefile:1.46 Tue Apr 6 13:11:17 2021 +++ pkgsrc/math/py-scipy/Makefile Fri Apr 9 14:41:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2021/04/06 13:11:17 nia Exp $ +# $NetBSD: Makefile,v 1.47 2021/04/09 14:41:35 tnn Exp $ DISTNAME= scipy-1.6.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -31,7 +31,7 @@ FFLAGS+= -fPIC LDFLAGS.Darwin+= -headerpad_max_install_names -PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONS_INCOMPATIBLE= 36 27 REPLACE_PYTHON+= scipy/sparse/linalg/isolve/tests/test_gcrotmk.py --_----------=_1617979296215490--