Tue Jun 2 03:40:57 2020 UTC ()
Make explicit python version test more robust.

Now if you come here looking for python27 it fails properly instead of
throwing a make syntax error.


(dholland)
diff -r1.89 -r1.90 pkgsrc/devel/py-test/Makefile
cvs diff -r1.89 -r1.90 pkgsrc/devel/py-test/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-test/Makefile 2020/05/16 08:00:01 1.89
+++ pkgsrc/devel/py-test/Makefile 2020/06/02 03:40:57 1.90
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.89 2020/05/16 08:00:01 adam Exp $ 1# $NetBSD: Makefile,v 1.90 2020/06/02 03:40:57 dholland Exp $
2 2
3DISTNAME= pytest-5.4.2 3DISTNAME= pytest-5.4.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
5CATEGORIES= devel python 5CATEGORIES= devel python
6MASTER_SITES= ${MASTER_SITE_PYPI:=p/pytest/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=p/pytest/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://pytest.org/ 9HOMEPAGE= https://pytest.org/
10COMMENT= Python testing tool 10COMMENT= Python testing tool
11LICENSE= mit 11LICENSE= mit
12 12
13DEPENDS+= ${PYPKGPREFIX}-attrs>=17.4.0:../../devel/py-attrs 13DEPENDS+= ${PYPKGPREFIX}-attrs>=17.4.0:../../devel/py-attrs
14DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 14DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
@@ -18,27 +18,27 @@ DEPENDS+= ${PYPKGPREFIX}-pluggy>=0.12:.. @@ -18,27 +18,27 @@ DEPENDS+= ${PYPKGPREFIX}-pluggy>=0.12:..
18DEPENDS+= ${PYPKGPREFIX}-py>=1.5.0:../../devel/py-py 18DEPENDS+= ${PYPKGPREFIX}-py>=1.5.0:../../devel/py-py
19DEPENDS+= ${PYPKGPREFIX}-wcwidth-[0-9]*:../../devel/py-wcwidth 19DEPENDS+= ${PYPKGPREFIX}-wcwidth-[0-9]*:../../devel/py-wcwidth
20BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm 20BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
21TEST_DEPENDS+= ${PYPKGPREFIX}-argcomplete-[0-9]*:../../devel/py-argcomplete 21TEST_DEPENDS+= ${PYPKGPREFIX}-argcomplete-[0-9]*:../../devel/py-argcomplete
22TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=3.56:../../devel/py-hypothesis 22TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=3.56:../../devel/py-hypothesis
23TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock 23TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
24TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose 24TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
25TEST_DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests 25TEST_DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
26TEST_DEPENDS+= ${PYPKGPREFIX}-xmlschema-[0-9]*:../../textproc/py-xmlschema 26TEST_DEPENDS+= ${PYPKGPREFIX}-xmlschema-[0-9]*:../../textproc/py-xmlschema
27 27
28PYTHON_VERSIONS_INCOMPATIBLE= 27 # since 5.0.0 28PYTHON_VERSIONS_INCOMPATIBLE= 27 # since 5.0.0
29 29
30.include "../../lang/python/pyversion.mk" 30.include "../../lang/python/pyversion.mk"
31.if ${_PYTHON_VERSION} < 38 31.if ${_PYTHON_VERSION:S/none/0/} < 38
32DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metadata 32DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metadata
33.endif 33.endif
34 34
35USE_LANGUAGES= # none 35USE_LANGUAGES= # none
36USE_TOOLS+= bash:build 36USE_TOOLS+= bash:build
37 37
38post-install: 38post-install:
39 cd ${DESTDIR}${PREFIX}/bin && \ 39 cd ${DESTDIR}${PREFIX}/bin && \
40 ${MV} py.test py.test-${PYVERSSUFFIX} && \ 40 ${MV} py.test py.test-${PYVERSSUFFIX} && \
41 ${MV} pytest pytest-${PYVERSSUFFIX} || ${TRUE} 41 ${MV} pytest pytest-${PYVERSSUFFIX} || ${TRUE}
42 42
43do-test: 43do-test:
44 cd ${WRKSRC}/testing && pytest-${PYVERSSUFFIX} 44 cd ${WRKSRC}/testing && pytest-${PYVERSSUFFIX}