[pkgsrc/trunk]: pkgsrc revert wrong fix for py-scipy python 3.6 deprecation, ...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d2320c36b57
branches:  trunk
changeset: 450035:5d2320c36b57
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Apr 09 14:41:34 2021 +0000

description:
revert wrong fix for py-scipy python 3.6 deprecation, fix properly

diffstat:

 finance/py-empyrical/Makefile        |  4 ++--
 finance/py-pyfolio/Makefile          |  4 ++--
 geography/py-obspy/Makefile          |  4 ++--
 graphics/py-matplotlib-venn/Makefile |  4 ++--
 graphics/py-seaborn/Makefile         |  4 ++--
 math/py-Theano/Makefile              |  4 ++--
 math/py-abcpmc/Makefile              |  4 ++--
 math/py-arviz/Makefile               |  4 ++--
 math/py-lmfit/Makefile               |  4 ++--
 math/py-pandas/Makefile              |  4 ++--
 math/py-powerlaw/Makefile            |  4 ++--
 math/py-pymc3/Makefile               |  4 ++--
 math/py-scikit-learn/Makefile        |  4 ++--
 math/py-scipy/Makefile               |  4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diffs (252 lines):

diff -r 660626de237e -r 5d2320c36b57 finance/py-empyrical/Makefile
--- a/finance/py-empyrical/Makefile     Fri Apr 09 14:30:09 2021 +0000
+++ b/finance/py-empyrical/Makefile     Fri Apr 09 14:41:34 2021 +0000
@@ -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 @@
 
 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"
diff -r 660626de237e -r 5d2320c36b57 finance/py-pyfolio/Makefile
--- a/finance/py-pyfolio/Makefile       Fri Apr 09 14:30:09 2021 +0000
+++ b/finance/py-pyfolio/Makefile       Fri Apr 09 14:41:34 2021 +0000
@@ -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 @@
 
 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"
diff -r 660626de237e -r 5d2320c36b57 geography/py-obspy/Makefile
--- a/geography/py-obspy/Makefile       Fri Apr 09 14:30:09 2021 +0000
+++ b/geography/py-obspy/Makefile       Fri Apr 09 14:41:34 2021 +0000
@@ -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 @@
 
 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 {} \;
diff -r 660626de237e -r 5d2320c36b57 graphics/py-matplotlib-venn/Makefile
--- a/graphics/py-matplotlib-venn/Makefile      Fri Apr 09 14:30:09 2021 +0000
+++ b/graphics/py-matplotlib-venn/Makefile      Fri Apr 09 14:41:34 2021 +0000
@@ -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}-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"
diff -r 660626de237e -r 5d2320c36b57 graphics/py-seaborn/Makefile
--- a/graphics/py-seaborn/Makefile      Fri Apr 09 14:30:09 2021 +0000
+++ b/graphics/py-seaborn/Makefile      Fri Apr 09 14:41:34 2021 +0000
@@ -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 @@
 
 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"
diff -r 660626de237e -r 5d2320c36b57 math/py-Theano/Makefile
--- a/math/py-Theano/Makefile   Fri Apr 09 14:30:09 2021 +0000
+++ b/math/py-Theano/Makefile   Fri Apr 09 14:41:34 2021 +0000
@@ -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.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 && \
diff -r 660626de237e -r 5d2320c36b57 math/py-abcpmc/Makefile
--- a/math/py-abcpmc/Makefile   Fri Apr 09 14:30:09 2021 +0000
+++ b/math/py-abcpmc/Makefile   Fri Apr 09 14:41:34 2021 +0000
@@ -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 @@
 
 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"
diff -r 660626de237e -r 5d2320c36b57 math/py-arviz/Makefile
--- a/math/py-arviz/Makefile    Fri Apr 09 14:30:09 2021 +0000
+++ b/math/py-arviz/Makefile    Fri Apr 09 14:41:34 2021 +0000
@@ -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 @@
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE=  36 27   # py-scipy
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 660626de237e -r 5d2320c36b57 math/py-lmfit/Makefile
--- a/math/py-lmfit/Makefile    Fri Apr 09 14:30:09 2021 +0000
+++ b/math/py-lmfit/Makefile    Fri Apr 09 14:41:34 2021 +0000
@@ -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 @@
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE=  36 27   # py-scipy
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 660626de237e -r 5d2320c36b57 math/py-pandas/Makefile
--- a/math/py-pandas/Makefile   Fri Apr 09 14:30:09 2021 +0000
+++ b/math/py-pandas/Makefile   Fri Apr 09 14:41:34 2021 +0000
@@ -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 @@
 
 USE_LANGUAGES= c c++
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE=  36 27   # py-scipy
 
 PYSETUPTESTTARGET=     pytest
 
diff -r 660626de237e -r 5d2320c36b57 math/py-powerlaw/Makefile
--- a/math/py-powerlaw/Makefile Fri Apr 09 14:30:09 2021 +0000
+++ b/math/py-powerlaw/Makefile Fri Apr 09 14:41:34 2021 +0000
@@ -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 @@
 
 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"
diff -r 660626de237e -r 5d2320c36b57 math/py-pymc3/Makefile
--- a/math/py-pymc3/Makefile    Fri Apr 09 14:30:09 2021 +0000
+++ b/math/py-pymc3/Makefile    Fri Apr 09 14:41:34 2021 +0000
@@ -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}-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"
diff -r 660626de237e -r 5d2320c36b57 math/py-scikit-learn/Makefile
--- a/math/py-scikit-learn/Makefile     Fri Apr 09 14:30:09 2021 +0000
+++ b/math/py-scikit-learn/Makefile     Fri Apr 09 14:41:34 2021 +0000
@@ -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 @@
 
 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"
diff -r 660626de237e -r 5d2320c36b57 math/py-scipy/Makefile
--- a/math/py-scipy/Makefile    Fri Apr 09 14:30:09 2021 +0000
+++ b/math/py-scipy/Makefile    Fri Apr 09 14:41:34 2021 +0000
@@ -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 @@
 
 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