diff --git a/deskutils/py-bugwarrior/Makefile b/deskutils/py-bugwarrior/Makefile index bdbc59cf606b..ead6d76e4479 100644 --- a/deskutils/py-bugwarrior/Makefile +++ b/deskutils/py-bugwarrior/Makefile @@ -27,7 +27,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twiggy>0:devel/py-twiggy \ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \ ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 \ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose OPTIONS_DEFINE= BUGZILLA JIRA PHABRICATOR diff --git a/devel/py-filemagic/Makefile b/devel/py-filemagic/Makefile index 964492aa49b5..fd09bcb39188 100644 --- a/devel/py-filemagic/Makefile +++ b/devel/py-filemagic/Makefile @@ -28,10 +28,6 @@ GH_TAGNAME= b24df9f .include -.if ${PYTHON_REL} < 3000 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 -.endif - regression-test: build @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test diff --git a/devel/py-phabricator/Makefile b/devel/py-phabricator/Makefile index e97ec1a14006..a72c7aa996de 100644 --- a/devel/py-phabricator/Makefile +++ b/devel/py-phabricator/Makefile @@ -14,8 +14,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock USES= python USE_PYTHON= autoplist distutils diff --git a/devel/py-sanetime/Makefile b/devel/py-sanetime/Makefile index 00912658aa9e..35602ed193e9 100644 --- a/devel/py-sanetime/Makefile +++ b/devel/py-sanetime/Makefile @@ -15,7 +15,6 @@ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}pytz>=2010:devel/py-pytz -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2:devel/py-unittest2 OPTIONS_DEFINE= TESTS TESTS_DESC= Include tools for unit tests diff --git a/devel/py-trollius/Makefile b/devel/py-trollius/Makefile index 4730f7e49da6..08fa3a0b8036 100644 --- a/devel/py-trollius/Makefile +++ b/devel/py-trollius/Makefile @@ -21,7 +21,6 @@ NO_ARCH= yes .if ${PYTHON_REL} < 3000 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 .if ${PYTHON_REL} < 3300 TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock .endif diff --git a/finance/py-stripe/Makefile b/finance/py-stripe/Makefile index 9cd560736436..f4b43f33b856 100644 --- a/finance/py-stripe/Makefile +++ b/finance/py-stripe/Makefile @@ -16,8 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.8.8:www/py-requests TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19:ftp/py-pycurl \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock USES= python USE_PYTHON= autoplist distutils diff --git a/net/py-amqp/Makefile b/net/py-amqp/Makefile index 8623d2647d9f..687d4dc16bb1 100644 --- a/net/py-amqp/Makefile +++ b/net/py-amqp/Makefile @@ -12,8 +12,7 @@ COMMENT= Low-level AMQP client for Python (fork of amqplib) LICENSE= LGPL21 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2>=0.4.0:devel/py-unittest2 \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock diff --git a/security/py-oauthlib/Makefile b/security/py-oauthlib/Makefile index 523dc6e5ab5b..37485303f056 100644 --- a/security/py-oauthlib/Makefile +++ b/security/py-oauthlib/Makefile @@ -38,8 +38,7 @@ NO_ARCH= yes .include .if ${PYTHON_REL} < 3000 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock .endif do-test: diff --git a/security/py-rsa/Makefile b/security/py-rsa/Makefile index a9e02e4091bb..c38547b9dc2d 100644 --- a/security/py-rsa/Makefile +++ b/security/py-rsa/Makefile @@ -14,7 +14,6 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 USES= python USE_PYTHON= autoplist distutils diff --git a/security/py-scrypt/Makefile b/security/py-scrypt/Makefile index 23a3cd2dab32..8c7cff61a6a1 100644 --- a/security/py-scrypt/Makefile +++ b/security/py-scrypt/Makefile @@ -12,8 +12,6 @@ COMMENT= Bindings for the scrypt key derivation function library LICENSE= BSD2CLAUSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 - USES= python ssl USE_PYTHON= autoplist distutils CFLAGS+= -I${OPENSSLINC} diff --git a/www/py-autobahn/Makefile b/www/py-autobahn/Makefile index d9dfd4b1fe35..f60766287df9 100644 --- a/www/py-autobahn/Makefile +++ b/www/py-autobahn/Makefile @@ -17,7 +17,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \ ${PYTHON_PKGNAMEPREFIX}txaio>=2.2.0:devel/py-txaio TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.7.2:devel/py-pytest \ ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 \ ${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius # Not really a depends, but the test doesnt skip USES= python diff --git a/www/py-cactus/Makefile b/www/py-cactus/Makefile index 05eaa622bb61..d1305cbd06c8 100644 --- a/www/py-cactus/Makefile +++ b/www/py-cactus/Makefile @@ -22,8 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django16>0:www/py-django16 \ ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama \ ${PYTHON_PKGNAMEPREFIX}django-markwhat>0:www/py-django-markwhat TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock USES= python:-2.7 USE_PYTHON= autoplist concurrent distutils diff --git a/www/py-slumber/Makefile b/www/py-slumber/Makefile index 5e003719d562..616459f0eaee 100644 --- a/www/py-slumber/Makefile +++ b/www/py-slumber/Makefile @@ -13,8 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock OPTIONS_DEFINE= YAML