Received: by mail.netbsd.org (Postfix, from userid 605) id A104084DD4; Tue, 2 Jun 2020 03:40:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 29C1584DC4 for ; Tue, 2 Jun 2020 03:40:58 +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 wU2DN4bNUf4v for ; Tue, 2 Jun 2020 03:40:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7A04D84CE0 for ; Tue, 2 Jun 2020 03:40:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 73AA1FB27; Tue, 2 Jun 2020 03:40:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1591069257231720" MIME-Version: 1.0 Date: Tue, 2 Jun 2020 03:40:57 +0000 From: "David A. Holland" Subject: CVS commit: pkgsrc/devel/py-test To: pkgsrc-changes@NetBSD.org Reply-To: dholland@netbsd.org X-Mailer: log_accum Message-Id: <20200602034057.73AA1FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1591069257231720 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: dholland Date: Tue Jun 2 03:40:57 UTC 2020 Modified Files: pkgsrc/devel/py-test: Makefile Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 pkgsrc/devel/py-test/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1591069257231720 Content-Disposition: inline Content-Length: 779 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-test/Makefile diff -u pkgsrc/devel/py-test/Makefile:1.89 pkgsrc/devel/py-test/Makefile:1.90 --- pkgsrc/devel/py-test/Makefile:1.89 Sat May 16 08:00:01 2020 +++ pkgsrc/devel/py-test/Makefile Tue Jun 2 03:40:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2020/05/16 08:00:01 adam Exp $ +# $NetBSD: Makefile,v 1.90 2020/06/02 03:40:57 dholland Exp $ DISTNAME= pytest-5.4.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -28,7 +28,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-xmlschema- PYTHON_VERSIONS_INCOMPATIBLE= 27 # since 5.0.0 .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} < 38 +.if ${_PYTHON_VERSION:S/none/0/} < 38 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metadata .endif --_----------=_1591069257231720--