CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Fri, 29 Apr 2022 23:29:18 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Apr 29 23:29:18 UTC 2022

Modified Files:
        pkgsrc/converters/py-zfec: Makefile
        pkgsrc/databases/py-sqlalchemy-migrate: Makefile
        pkgsrc/devel/py-buildbot-worker: Makefile
        pkgsrc/devel/py-fixtures: Makefile
        pkgsrc/devel/py-linecache2: Makefile
        pkgsrc/devel/py-lockfile: Makefile
        pkgsrc/devel/py-requests-mock: Makefile
        pkgsrc/devel/py-requests-unixsocket: Makefile
        pkgsrc/devel/py-setuptools44: Makefile
        pkgsrc/devel/py-testresources: Makefile
        pkgsrc/devel/py-testscenarios: Makefile
        pkgsrc/devel/py-traceback2: Makefile
        pkgsrc/www/py-wstools: Makefile

Log Message:
*: mark dependencies of py-pbr and py-test-virtualenv as not-for-python-2.x


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/converters/py-zfec/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/py-sqlalchemy-migrate/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-buildbot-worker/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-fixtures/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-linecache2/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-lockfile/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/py-requests-mock/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-requests-unixsocket/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-setuptools44/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-testresources/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-testscenarios/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-traceback2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-wstools/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/converters/py-zfec/Makefile
diff -u pkgsrc/converters/py-zfec/Makefile:1.31 pkgsrc/converters/py-zfec/Makefile:1.32
--- pkgsrc/converters/py-zfec/Makefile:1.31     Sun Feb 13 08:53:42 2022
+++ pkgsrc/converters/py-zfec/Makefile  Fri Apr 29 23:29:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2022/02/13 08:53:42 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2022/04/29 23:29:17 wiz Exp $
 
 DISTNAME=      zfec-1.5.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,13 +14,9 @@ LICENSE=     gnu-gpl-v2
 DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 DEPENDS+=      ${PYPKGPREFIX}-pyutil>=3.0.0:../../devel/py-pyutil
 TEST_DEPENDS+= ${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
+TEST_DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
-PYTHON_VERSIONED_DEPENDENCIES+=        twisted:test
-
-.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == 27
-DEPENDS+=      ${PYPKGPREFIX}-argparse>=0.8:../../devel/py-argparse
-.endif
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 REPLACE_PYTHON+=       zfec/cmdline_zfec.py
 REPLACE_PYTHON+=       zfec/cmdline_zunfec.py
@@ -35,6 +31,5 @@ post-install:
 .endfor
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/py-sqlalchemy-migrate/Makefile
diff -u pkgsrc/databases/py-sqlalchemy-migrate/Makefile:1.20 pkgsrc/databases/py-sqlalchemy-migrate/Makefile:1.21
--- pkgsrc/databases/py-sqlalchemy-migrate/Makefile:1.20        Wed Jan  5 15:40:59 2022
+++ pkgsrc/databases/py-sqlalchemy-migrate/Makefile     Fri Apr 29 23:29:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2022/01/05 15:40:59 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/04/29 23:29:17 wiz Exp $
 
 DISTNAME=      sqlalchemy-migrate-0.13.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,6 +18,8 @@ DEPENDS+=     ${PYPKGPREFIX}-sqlparse-[0-9]*
 DEPENDS+=      ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.7.0:../../lang/py-six
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 USE_LANGUAGES=         # none
 
 USE_PKG_RESOURCES=     yes

Index: pkgsrc/devel/py-buildbot-worker/Makefile
diff -u pkgsrc/devel/py-buildbot-worker/Makefile:1.12 pkgsrc/devel/py-buildbot-worker/Makefile:1.13
--- pkgsrc/devel/py-buildbot-worker/Makefile:1.12       Sun Feb 13 08:53:43 2022
+++ pkgsrc/devel/py-buildbot-worker/Makefile    Fri Apr 29 23:29:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/02/13 08:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/04/29 23:29:17 wiz Exp $
 
 DISTNAME=      buildbot-worker-2.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,10 +12,11 @@ COMMENT=    Worker for the buildbot CI syst
 LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
+DEPENDS+=      ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 
-PYTHON_VERSIONED_DEPENDENCIES+=        twisted
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
@@ -27,5 +28,4 @@ post-install:
        ${MV} buildbot_worker_windows_service buildbot_worker_windows_service-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-fixtures/Makefile
diff -u pkgsrc/devel/py-fixtures/Makefile:1.5 pkgsrc/devel/py-fixtures/Makefile:1.6
--- pkgsrc/devel/py-fixtures/Makefile:1.5       Thu Jan 27 10:57:31 2022
+++ pkgsrc/devel/py-fixtures/Makefile   Fri Apr 29 23:29:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/27 10:57:31 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/04/29 23:29:17 wiz Exp $
 
 DISTNAME=      fixtures-3.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,14 +13,14 @@ LICENSE=    apache-2.0 OR modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.0.0:../../lang/py-six
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 # 9 test failures as of 3.0.0
 # https://github.com/testing-cabal/fixtures/issues/35
-# TEST_DEPENDS
+TEST_DEPENDS+=         ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+TEST_DEPENDS+=         ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
 # needs py-testtools for testing, but that depends on this
-#PYTHON_VERSIONED_DEPENDENCIES+=       testtools:build
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
+#TEST_DEPENDS+=                ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
 .include "../../lang/python/egg.mk"
-#.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-linecache2/Makefile
diff -u pkgsrc/devel/py-linecache2/Makefile:1.6 pkgsrc/devel/py-linecache2/Makefile:1.7
--- pkgsrc/devel/py-linecache2/Makefile:1.6     Tue Jan  4 20:53:15 2022
+++ pkgsrc/devel/py-linecache2/Makefile Fri Apr 29 23:29:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:53:15 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/04/29 23:29:17 wiz Exp $
 
 DISTNAME=              linecache2-1.0.0
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
@@ -13,6 +13,8 @@ LICENSE=              python-software-foundation
 
 DEPENDS+=              ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 # https://github.com/testing-cabal/linecache2/issues/2
 # https://bugs.python.org/issue24054
 post-extract:

Index: pkgsrc/devel/py-lockfile/Makefile
diff -u pkgsrc/devel/py-lockfile/Makefile:1.6 pkgsrc/devel/py-lockfile/Makefile:1.7
--- pkgsrc/devel/py-lockfile/Makefile:1.6       Tue Jan  4 20:53:15 2022
+++ pkgsrc/devel/py-lockfile/Makefile   Fri Apr 29 23:29:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/04 20:53:15 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/04/29 23:29:17 wiz Exp $
 
 DISTNAME=      lockfile-0.12.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,5 +16,7 @@ BUILD_DEPENDS+=       ${PYPKGPREFIX}-pbr>=1.8:
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONS_INCOMPATIBLE=   27
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-requests-mock/Makefile
diff -u pkgsrc/devel/py-requests-mock/Makefile:1.16 pkgsrc/devel/py-requests-mock/Makefile:1.17
--- pkgsrc/devel/py-requests-mock/Makefile:1.16 Thu Jan 27 10:57:32 2022
+++ pkgsrc/devel/py-requests-mock/Makefile      Fri Apr 29 23:29:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/01/27 10:57:32 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2022/04/29 23:29:17 wiz Exp $
 
 DISTNAME=      requests-mock-1.9.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,15 +17,17 @@ BUILD_DEPENDS+=     ${PYPKGPREFIX}-pbr-[0-9]
 TEST_DEPENDS+= ${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-purl-[0-9]*:../../www/py-purl
+TEST_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+= ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 TEST_DEPENDS+= ${PYPKGPREFIX}-testrepository>=0.0.18:../../devel/py-testrepository
 
-USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-PYTHON_VERSIONED_DEPENDENCIES= sphinx:test test:test testtools:test
+USE_LANGUAGES= # none
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-requests-unixsocket/Makefile
diff -u pkgsrc/devel/py-requests-unixsocket/Makefile:1.3 pkgsrc/devel/py-requests-unixsocket/Makefile:1.4
--- pkgsrc/devel/py-requests-unixsocket/Makefile:1.3    Tue Jan  4 20:53:36 2022
+++ pkgsrc/devel/py-requests-unixsocket/Makefile        Fri Apr 29 23:29:18 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:53:36 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/04/29 23:29:18 wiz Exp $
 
 DISTNAME=      requests-unixsocket-0.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,6 +15,8 @@ BUILD_DEPENDS+=       ${PYPKGPREFIX}-pbr-[0-9]
 DEPENDS+=      ${PYPKGPREFIX}-requests>=1.1:../../devel/py-requests
 DEPENDS+=      ${PYPKGPREFIX}-urllib3>=1.8:../../www/py-urllib3
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 USE_LANGUAGES= # none
 
 REPLACE_PYTHON+=       requests_unixsocket/tests/test_requests_unixsocket.py

Index: pkgsrc/devel/py-setuptools44/Makefile
diff -u pkgsrc/devel/py-setuptools44/Makefile:1.3 pkgsrc/devel/py-setuptools44/Makefile:1.4
--- pkgsrc/devel/py-setuptools44/Makefile:1.3   Mon Jan 10 23:49:02 2022
+++ pkgsrc/devel/py-setuptools44/Makefile       Fri Apr 29 23:29:18 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/10 23:49:02 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/04/29 23:29:18 wiz Exp $
 
 DISTNAME=      setuptools-44.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,7 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]
 TEST_DEPENDS+= ${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-fixture-config-[0-9]*:../../devel/py-test-fixture-config
 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}-test-virtualenv-[0-9]*:../../devel/py-test-virtualenv
 TEST_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 
 REPLACE_PYTHON+=       setuptools/command/easy_install.py

Index: pkgsrc/devel/py-testresources/Makefile
diff -u pkgsrc/devel/py-testresources/Makefile:1.6 pkgsrc/devel/py-testresources/Makefile:1.7
--- pkgsrc/devel/py-testresources/Makefile:1.6  Thu Jan 27 10:57:32 2022
+++ pkgsrc/devel/py-testresources/Makefile      Fri Apr 29 23:29:18 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/27 10:57:32 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/04/29 23:29:18 wiz Exp $
 
 DISTNAME=      testresources-2.0.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,12 +13,13 @@ LICENSE=    apache-2.0 OR modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
 DEPENDS+=      ${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
+DEPENDS+=      ${PYPKGPREFIX}-testttols-[0-9]*:../../devel/py-testttols
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test testtools
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-testscenarios/Makefile
diff -u pkgsrc/devel/py-testscenarios/Makefile:1.5 pkgsrc/devel/py-testscenarios/Makefile:1.6
--- pkgsrc/devel/py-testscenarios/Makefile:1.5  Thu Jan 27 10:57:32 2022
+++ pkgsrc/devel/py-testscenarios/Makefile      Fri Apr 29 23:29:18 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/27 10:57:32 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/04/29 23:29:18 wiz Exp $
 
 DISTNAME=      testscenarios-0.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,11 +12,11 @@ COMMENT=    Pyunit extension for dependency
 LICENSE=       apache-2.0 OR modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
+DEPENDS+=      ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
-PYTHON_VERSIONED_DEPENDENCIES+=        testtools
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 TEST_TARGET=   check
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-traceback2/Makefile
diff -u pkgsrc/devel/py-traceback2/Makefile:1.4 pkgsrc/devel/py-traceback2/Makefile:1.5
--- pkgsrc/devel/py-traceback2/Makefile:1.4     Tue Jan  4 20:53:45 2022
+++ pkgsrc/devel/py-traceback2/Makefile Fri Apr 29 23:29:18 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:53:45 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/04/29 23:29:18 wiz Exp $
 
 DISTNAME=              traceback2-1.4.0
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
@@ -13,5 +13,7 @@ LICENSE=              python-software-foundation
 
 DEPENDS+=              ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-wstools/Makefile
diff -u pkgsrc/www/py-wstools/Makefile:1.2 pkgsrc/www/py-wstools/Makefile:1.3
--- pkgsrc/www/py-wstools/Makefile:1.2  Tue Jan  4 20:55:38 2022
+++ pkgsrc/www/py-wstools/Makefile      Fri Apr 29 23:29:18 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:55:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/04/29 23:29:18 wiz Exp $
 
 DISTNAME=      wstools-0.4.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,5 +17,7 @@ BUILD_DEPENDS+=       ${PYPKGPREFIX}-test-runn
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Prev by Date: CVS commit: pkgsrc
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index