CVS commit: pkgsrc/math

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/math
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 17 May 2020 18:57:26 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun May 17 18:57:26 UTC 2020

Modified Files:
        pkgsrc/math/py-infinity: Makefile
        pkgsrc/math/py-intervals: Makefile
        pkgsrc/math/py-numpy16: Makefile
        pkgsrc/math/py-scipy12: Makefile

Log Message:
pytest from versioned depends


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-infinity/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/py-intervals/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/py-numpy16/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-scipy12/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-infinity/Makefile
diff -u pkgsrc/math/py-infinity/Makefile:1.4 pkgsrc/math/py-infinity/Makefile:1.5
--- pkgsrc/math/py-infinity/Makefile:1.4        Wed Sep 27 20:21:54 2017
+++ pkgsrc/math/py-infinity/Makefile    Sun May 17 18:57:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/09/27 20:21:54 adam Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/17 18:57:26 adam Exp $
 
 DISTNAME=      infinity-1.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,11 +10,12 @@ HOMEPAGE=   https://github.com/kvesteri/in
 COMMENT=       All-in-one infinity value for Python
 LICENSE=       modified-bsd
 
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-flake8>=2.4.0:../../devel/py-flake8
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-isort>=4.2.2:../../devel/py-isort
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-test>=2.2.3:../../devel/py-test
+TEST_DEPENDS+= ${PYPKGPREFIX}-flake8>=2.4.0:../../devel/py-flake8
+TEST_DEPENDS+= ${PYPKGPREFIX}-isort>=4.2.2:../../devel/py-isort
+TEST_DEPENDS+= ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
+TEST_DEPENDS+= ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -22,4 +23,5 @@ do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/py-intervals/Makefile
diff -u pkgsrc/math/py-intervals/Makefile:1.5 pkgsrc/math/py-intervals/Makefile:1.6
--- pkgsrc/math/py-intervals/Makefile:1.5       Sun Dec 10 17:01:48 2017
+++ pkgsrc/math/py-intervals/Makefile   Sun May 17 18:57:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/12/10 17:01:48 adam Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/17 18:57:26 adam Exp $
 
 DISTNAME=      intervals-0.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,10 +11,11 @@ COMMENT=    Tools for handling intervals (r
 LICENSE=       modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-infinity>=0.1.3:../../math/py-infinity
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-flake8>=2.4.0:../../devel/py-flake8
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-isort>=4.2.2:../../devel/py-isort
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-test>=2.2.3:../../devel/py-test
+TEST_DEPENDS+= ${PYPKGPREFIX}-flake8>=2.4.0:../../devel/py-flake8
+TEST_DEPENDS+= ${PYPKGPREFIX}-isort>=4.2.2:../../devel/py-isort
+TEST_DEPENDS+= ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES= # none
 
@@ -22,4 +23,5 @@ do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/py-numpy16/Makefile
diff -u pkgsrc/math/py-numpy16/Makefile:1.1 pkgsrc/math/py-numpy16/Makefile:1.2
--- pkgsrc/math/py-numpy16/Makefile:1.1 Mon Apr 27 16:52:55 2020
+++ pkgsrc/math/py-numpy16/Makefile     Sun May 17 18:57:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/04/27 16:52:55 adam Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/17 18:57:26 adam Exp $
 
 DISTNAME=      numpy-1.16.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,8 @@ COMMENT=      Array processing for numbers, s
 LICENSE=       modified-bsd
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
 
 USE_LANGUAGES=         c fortran
 MAKE_ENV+=             ATLAS=None
@@ -52,6 +53,7 @@ BUILDLINK_API_DEPENDS.py-cython+=     ${PYPK
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .if ${OPSYS} != "Darwin"
 # blas and lapack are not needed; numpy will use Accelerate.framework
 .include "../../math/blas/buildlink3.mk"

Index: pkgsrc/math/py-scipy12/Makefile
diff -u pkgsrc/math/py-scipy12/Makefile:1.4 pkgsrc/math/py-scipy12/Makefile:1.5
--- pkgsrc/math/py-scipy12/Makefile:1.4 Thu Mar 19 19:28:52 2020
+++ pkgsrc/math/py-scipy12/Makefile     Sun May 17 18:57:26 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2020/03/19 19:28:52 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/17 18:57:26 adam Exp $
 
-DISTNAME=      scipy-1.2.2
+DISTNAME=      scipy-1.2.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/scipy/}
@@ -10,6 +10,10 @@ HOMEPAGE=    https://www.scipy.org/
 COMMENT=       Scientific Algorithms Library for Python
 LICENSE=       modified-bsd
 
+TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
+
+PYTHON_VERSIONED_DEPENDENCIES= test:test
+
 USE_LANGUAGES+=        c c++ fortran
 MAKE_ENV+=     ATLAS=None
 
@@ -20,7 +24,6 @@ MAKE_ENV+=    ATLAS=None
 PYSETUPBUILDARGS+=     --fcompiler=g95
 .elif defined(PKGSRC_FORTRAN) && ${PKGSRC_FORTRAN} == "gfortran"
 PYSETUPBUILDARGS+=     --fcompiler=gnu95
-LDFLAGS.Darwin+=       -undefined dynamic_lookup
 .else
 BROKEN=                        "Requires fortran 95"
 .endif
@@ -35,14 +38,6 @@ REPLACE_PYTHON+=     scipy/sparse/linalg/iso
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
-# When unpacked by root, files with excessive permissions (group and
-# world writable, gratuitously executable) result, apparently only on
-# Darwin.  Use a large hammer for now.
-# \todo Consider using a working EXTRACT tool.
-post-extract:
-       chmod -R go-w ${WRKDIR}
-       ${FIND} ${WRKDIR} -type f | xargs chmod -x
-
 .PHONY: fix-darwin-install-name
 post-install: fix-darwin-install-name
 fix-darwin-install-name:
@@ -54,9 +49,6 @@ fix-darwin-install-name:
        done
 .endif
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
-
 # self test failures for 1.1.0 reported at
 # https://github.com/scipy/scipy/issues/9196
 # needs 'make install' first!
@@ -66,6 +58,7 @@ do-test:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../math/blas/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/net/py-apache-libcloud
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/net/py-apache-libcloud
Indexes:

Home | Main Index | Thread Index | Old Index