Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/math pytest from versioned depends
details: https://anonhg.NetBSD.org/pkgsrc/rev/529c9ea4ab7e
branches: trunk
changeset: 431947:529c9ea4ab7e
user: adam <adam%pkgsrc.org@localhost>
date: Sun May 17 18:57:26 2020 +0000
description:
pytest from versioned depends
diffstat:
math/py-infinity/Makefile | 14 ++++++++------
math/py-intervals/Makefile | 12 +++++++-----
math/py-numpy16/Makefile | 6 ++++--
math/py-scipy12/Makefile | 21 +++++++--------------
4 files changed, 26 insertions(+), 27 deletions(-)
diffs (155 lines):
diff -r 61d9d428010f -r 529c9ea4ab7e math/py-infinity/Makefile
--- a/math/py-infinity/Makefile Sun May 17 18:56:59 2020 +0000
+++ b/math/py-infinity/Makefile Sun May 17 18:57:26 2020 +0000
@@ -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 @@
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 @@
cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 61d9d428010f -r 529c9ea4ab7e math/py-intervals/Makefile
--- a/math/py-intervals/Makefile Sun May 17 18:56:59 2020 +0000
+++ b/math/py-intervals/Makefile Sun May 17 18:57:26 2020 +0000
@@ -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 @@
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 @@
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 61d9d428010f -r 529c9ea4ab7e math/py-numpy16/Makefile
--- a/math/py-numpy16/Makefile Sun May 17 18:56:59 2020 +0000
+++ b/math/py-numpy16/Makefile Sun May 17 18:57:26 2020 +0000
@@ -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 @@
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 @@
.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"
diff -r 61d9d428010f -r 529c9ea4ab7e math/py-scipy12/Makefile
--- a/math/py-scipy12/Makefile Sun May 17 18:56:59 2020 +0000
+++ b/math/py-scipy12/Makefile Sun May 17 18:57:26 2020 +0000
@@ -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 @@
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 @@
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 @@
.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 @@
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 @@
.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"
Home |
Main Index |
Thread Index |
Old Index