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-pbr and py-test-virtualenv ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fa1c108cf13e
branches: trunk
changeset: 378156:fa1c108cf13e
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri Apr 29 23:29:17 2022 +0000
description:
*: mark dependencies of py-pbr and py-test-virtualenv as not-for-python-2.x
diffstat:
converters/py-zfec/Makefile | 11 +++--------
databases/py-sqlalchemy-migrate/Makefile | 4 +++-
devel/py-buildbot-worker/Makefile | 6 +++---
devel/py-fixtures/Makefile | 12 ++++++------
devel/py-linecache2/Makefile | 4 +++-
devel/py-lockfile/Makefile | 4 +++-
devel/py-requests-mock/Makefile | 10 ++++++----
devel/py-requests-unixsocket/Makefile | 4 +++-
devel/py-setuptools44/Makefile | 4 ++--
devel/py-testresources/Makefile | 7 ++++---
devel/py-testscenarios/Makefile | 6 +++---
devel/py-traceback2/Makefile | 4 +++-
www/py-wstools/Makefile | 4 +++-
13 files changed, 45 insertions(+), 35 deletions(-)
diffs (290 lines):
diff -r dab7161e1cb1 -r fa1c108cf13e converters/py-zfec/Makefile
--- a/converters/py-zfec/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/converters/py-zfec/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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 @@
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
-
-PYTHON_VERSIONED_DEPENDENCIES+= twisted:test
+TEST_DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
-.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 @@
.endfor
.include "../../lang/python/application.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff -r dab7161e1cb1 -r fa1c108cf13e databases/py-sqlalchemy-migrate/Makefile
--- a/databases/py-sqlalchemy-migrate/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/databases/py-sqlalchemy-migrate/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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}-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
diff -r dab7161e1cb1 -r fa1c108cf13e devel/py-buildbot-worker/Makefile
--- a/devel/py-buildbot-worker/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/devel/py-buildbot-worker/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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 @@
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 @@
${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"
diff -r dab7161e1cb1 -r fa1c108cf13e devel/py-fixtures/Makefile
--- a/devel/py-fixtures/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/devel/py-fixtures/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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 @@
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"
diff -r dab7161e1cb1 -r fa1c108cf13e devel/py-linecache2/Makefile
--- a/devel/py-linecache2/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/devel/py-linecache2/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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 @@
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:
diff -r dab7161e1cb1 -r fa1c108cf13e devel/py-lockfile/Makefile
--- a/devel/py-lockfile/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/devel/py-lockfile/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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 @@
USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff -r dab7161e1cb1 -r fa1c108cf13e devel/py-requests-mock/Makefile
--- a/devel/py-requests-mock/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/devel/py-requests-mock/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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 @@
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
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
USE_LANGUAGES= # none
-PYTHON_VERSIONED_DEPENDENCIES= sphinx:test test:test testtools:test
-
do-test:
cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r dab7161e1cb1 -r fa1c108cf13e devel/py-requests-unixsocket/Makefile
--- a/devel/py-requests-unixsocket/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/devel/py-requests-unixsocket/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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 @@
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
diff -r dab7161e1cb1 -r fa1c108cf13e devel/py-setuptools44/Makefile
--- a/devel/py-setuptools44/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/devel/py-setuptools44/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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}-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
diff -r dab7161e1cb1 -r fa1c108cf13e devel/py-testresources/Makefile
--- a/devel/py-testresources/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/devel/py-testresources/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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 @@
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"
diff -r dab7161e1cb1 -r fa1c108cf13e devel/py-testscenarios/Makefile
--- a/devel/py-testscenarios/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/devel/py-testscenarios/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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 @@
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"
diff -r dab7161e1cb1 -r fa1c108cf13e devel/py-traceback2/Makefile
--- a/devel/py-traceback2/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/devel/py-traceback2/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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 @@
DEPENDS+= ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff -r dab7161e1cb1 -r fa1c108cf13e www/py-wstools/Makefile
--- a/www/py-wstools/Makefile Fri Apr 29 23:22:31 2022 +0000
+++ b/www/py-wstools/Makefile Fri Apr 29 23:29:17 2022 +0000
@@ -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 @@
USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index