Received: by mail.netbsd.org (Postfix, from userid 605) id E4F2484DDA; Sat, 16 May 2020 08:03:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6BD9684D20 for ; Sat, 16 May 2020 08:03:36 +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 Z7hV4Z1YbgyF for ; Sat, 16 May 2020 08:03:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E31F484CE9 for ; Sat, 16 May 2020 08:03:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DD312FB27; Sat, 16 May 2020 08:03:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1589616215140040" MIME-Version: 1.0 Date: Sat, 16 May 2020 08:03:35 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/lang/python To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20200516080335.DD312FB27@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. --_----------=_1589616215140040 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sat May 16 08:03:35 UTC 2020 Modified Files: pkgsrc/lang/python: versioned_dependencies.mk Log Message: python: add pytest to versioned_dependencies.mk To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 pkgsrc/lang/python/versioned_dependencies.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1589616215140040 Content-Disposition: inline Content-Length: 2226 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/python/versioned_dependencies.mk diff -u pkgsrc/lang/python/versioned_dependencies.mk:1.38 pkgsrc/lang/python/versioned_dependencies.mk:1.39 --- pkgsrc/lang/python/versioned_dependencies.mk:1.38 Fri Mar 13 19:21:16 2020 +++ pkgsrc/lang/python/versioned_dependencies.mk Sat May 16 08:03:35 2020 @@ -1,4 +1,4 @@ -# $NetBSD: versioned_dependencies.mk,v 1.38 2020/03/13 19:21:16 wiz Exp $ +# $NetBSD: versioned_dependencies.mk,v 1.39 2020/05/16 08:03:35 adam Exp $ # # This file determines which separate distribution of a Python # package is used as dependency, depending on the Python version @@ -9,13 +9,13 @@ # PYTHON_VERSIONED_DEPENDENCIES # The Python package which should be added as a dependency. # -# Possible values: Pmw X cherrypy dialog html2text ipython jsonlib more-itertools python-digest sphinx zipp +# Possible values: Pmw X cherrypy dialog html2text ipython jsonlib more-itertools pytest python-digest sphinx zipp # Default: (nothing) # .include "../../lang/python/pyversion.mk" -# format: short name for PYTHON_VERSIONED_DEPENDENCIESpython-2.x pathpython-3.x path +# format: short name for PYTHON_VERSIONED_DEPENDENCIESPython-2.x pathPython-3.x path _SUPPORTED_PACKAGES= # empty _SUPPORTED_PACKAGES+= Pmw x11/py-Pmw x11/py-Pmw2 _SUPPORTED_PACKAGES+= X textproc/py-X2 textproc/py-X @@ -25,6 +25,7 @@ _SUPPORTED_PACKAGES+= html2text textproc _SUPPORTED_PACKAGES+= ipython devel/py-ipython5 devel/py-ipython _SUPPORTED_PACKAGES+= jsonlib textproc/py-jsonlib textproc/py-jsonlib3 _SUPPORTED_PACKAGES+= more-itertools devel/py-more-itertools2 devel/py-more-itertools +_SUPPORTED_PACKAGES+= pytest devel/py-test4 devel/py-test _SUPPORTED_PACKAGES+= python-digest www/py-python-digest www/py-python3-digest _SUPPORTED_PACKAGES+= sphinx textproc/py-sphinx1 textproc/py-sphinx _SUPPORTED_PACKAGES+= zipp archivers/py-zipp1 archivers/py-zipp @@ -36,7 +37,7 @@ type:= ${pattern:C/[^:]*//} . for name py2dir py3dir in ${_SUPPORTED_PACKAGES} . if "${pkg}" == "${name}" _PKG_MATCHED= yes -. if ${PYPKGPREFIX} == "py27" +. if ${_PYTHON_VERSION} == 27 dir:= ${py2dir} . else dir:= ${py3dir} --_----------=_1589616215140040--