pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc *: mark dependencies of py-virtualenv as not-for-pytho...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dab7161e1cb1
branches:  trunk
changeset: 378155:dab7161e1cb1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Apr 29 23:22:31 2022 +0000

description:
*: mark dependencies of py-virtualenv as not-for-python-2.x

diffstat:

 devel/py-pbr/Makefile              |   7 ++++---
 devel/py-setuptools_trial/Makefile |  11 +++--------
 devel/py-test-virtualenv/Makefile  |   6 +++---
 lang/py-paver/Makefile             |   4 +++-
 4 files changed, 13 insertions(+), 15 deletions(-)

diffs (99 lines):

diff -r 43a38347c173 -r dab7161e1cb1 devel/py-pbr/Makefile
--- a/devel/py-pbr/Makefile     Fri Apr 29 23:17:52 2022 +0000
+++ b/devel/py-pbr/Makefile     Fri Apr 29 23:22:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2022/04/26 10:42:22 adam Exp $
+# $NetBSD: Makefile,v 1.37 2022/04/29 23:22:31 wiz Exp $
 
 DISTNAME=      pbr-5.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -23,8 +23,10 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.32.0:../../devel/py-wheel
 # not packaged: hacking, stestr
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 # circular dependency - testtools depends on pbr
-#PYTHON_VERSIONED_DEPENDENCIES+=       testtools:test
+#TEST_DEPENDS+=        ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
 REPLACE_PYTHON+=       pbr/tests/testpackage/setup.py
 
@@ -36,5 +38,4 @@
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 43a38347c173 -r dab7161e1cb1 devel/py-setuptools_trial/Makefile
--- a/devel/py-setuptools_trial/Makefile        Fri Apr 29 23:17:52 2022 +0000
+++ b/devel/py-setuptools_trial/Makefile        Fri Apr 29 23:22:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/02/13 08:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/04/29 23:22:31 wiz Exp $
 
 DISTNAME=      setuptools_trial-0.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,19 +11,14 @@
 COMMENT=       Setuptools plugin for Twisted-based unit tests
 LICENSE=       modified-bsd
 
+DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-virtualenv-[0-9]*:../../devel/py-test-virtualenv
 TEST_DEPENDS+= ${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
 
-PYTHON_VERSIONED_DEPENDENCIES+=        twisted
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
-.include "../../lang/python/pyversion.mk"
-.if "${PYPKGPREFIX}" == "py27"
-DEPENDS+=      ${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2
-.endif
-
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 43a38347c173 -r dab7161e1cb1 devel/py-test-virtualenv/Makefile
--- a/devel/py-test-virtualenv/Makefile Fri Apr 29 23:17:52 2022 +0000
+++ b/devel/py-test-virtualenv/Makefile Fri Apr 29 23:22:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/04/29 23:22:31 wiz Exp $
 
 DISTNAME=      pytest-virtualenv-1.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -15,11 +15,11 @@
 DEPENDS+=      ${PYPKGPREFIX}-test-shutil-[0-9]*:../../devel/py-test-shutil
 DEPENDS+=      ${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
-PYTHON_VERSIONED_DEPENDENCIES= test
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 43a38347c173 -r dab7161e1cb1 lang/py-paver/Makefile
--- a/lang/py-paver/Makefile    Fri Apr 29 23:17:52 2022 +0000
+++ b/lang/py-paver/Makefile    Fri Apr 29 23:22:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/05 15:41:13 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/04/29 23:22:31 wiz Exp $
 
 DISTNAME=      Paver-1.3.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -17,6 +17,8 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 TEST_DEPENDS+= ${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 USE_LANGUAGES= # none
 
 USE_PKG_RESOURCES=     yes



Home | Main Index | Thread Index | Old Index