Index: Mk/Uses/python.mk =================================================================== --- Mk/Uses/python.mk +++ Mk/Uses/python.mk @@ -115,6 +115,10 @@ # - Pass this command to distutils on install stage. # default: install # +# PYDISTUTILS_TEST_TARGET +# - Pass this command to distutils on test stage. +# default: test +# # PYDISTUTILS_CONFIGUREARGS # - Arguments to config with distutils. # default: @@ -127,6 +131,10 @@ # - Arguments to install with distutils. # default: -c -O1 --prefix=${PREFIX} --single-version-externally-managed --root=${STAGEDIR} # +# PYDISTUTILS_TESTARGS +# - Arguments to test with distutils. +# default: +# # PYDISTUTILS_EGGINFO # - Canonical name for egg-info. # default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info @@ -578,26 +586,33 @@ PYDISTUTILS_CONFIGURE_TARGET?= config PYDISTUTILS_BUILD_TARGET?= build PYDISTUTILS_INSTALL_TARGET?= install +PYDISTUTILS_TEST_TARGET?= test .if defined(_PYTHON_FEATURE_DISTUTILS) LDSHARED?= ${CC} -shared MAKE_ENV+= LDSHARED="${LDSHARED}" PYTHONDONTWRITEBYTECODE= PYTHONOPTIMIZE= -.if !target(do-configure) && !defined(HAS_CONFIGURE) && !defined(GNU_CONFIGURE) +.if !target(do-configure) && !defined(NO_PYDISTUTILS_CONFIGURE) && \ + !defined(HAS_CONFIGURE) && !defined(GNU_CONFIGURE) do-configure: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS}) .endif -.if !target(do-build) +.if !target(do-build) && !defined(NO_PYDISTUTILS_BUILD) do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) .endif -.if !target(do-install) +.if !target(do-install) && !defined(NO_PYDISTUTILS_INSTALL) do-install: @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) .endif +.if !target(do-test) && !defined(NO_PYDISTUTILS_TEST) +do-test: + @(cd ${TEST_WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_TEST_TARGET} ${PYDISTUTILS_TESTARGS}) +.endif + add-plist-post: add-plist-egginfo .endif # defined(_PYTHON_FEATURE_DISTUTILS) .endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PYTHON_POST_MK) Index: databases/py-Pyrseas/Makefile =================================================================== --- databases/py-Pyrseas/Makefile +++ databases/py-Pyrseas/Makefile @@ -22,9 +22,9 @@ USE_GITHUB= yes GH_ACCOUNT= perseas -# Requires a running PostgreSQL instance - -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test +# |make test| requires a running PostgreSQL instance +.if defined(PACKAGE_BUILDING) +NO_TEST= yes +.endif .include Index: databases/py-pylibmc/Makefile =================================================================== --- databases/py-pylibmc/Makefile +++ databases/py-pylibmc/Makefile @@ -17,10 +17,6 @@ TEST_DEPENDS= memcached:${PORTSDIR}/databases/memcached \ nosetests:${PORTSDIR}/devel/py-nose -OPTIONS_DEFINE= TESTS -TESTS_DESC= Install test suite dependencies -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - USES= python USE_PYTHON= distutils autoplist @@ -29,7 +25,4 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_pylibmc.so -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: databases/py-redis/Makefile =================================================================== --- databases/py-redis/Makefile +++ databases/py-redis/Makefile @@ -33,9 +33,6 @@ USES+= gmake .endif -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - post-build: .if ${PORT_OPTIONS:MDOCS} @${ECHO_CMD} "Building documentation" Index: deskutils/py-bugwarrior/Makefile =================================================================== --- deskutils/py-bugwarrior/Makefile +++ deskutils/py-bugwarrior/Makefile @@ -35,7 +35,4 @@ USES= python:2 USE_PYTHON= autoplist concurrent distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: deskutils/py-taskw/Makefile =================================================================== --- deskutils/py-taskw/Makefile +++ deskutils/py-taskw/Makefile @@ -21,7 +21,4 @@ USES= python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-Jinja2/Makefile =================================================================== --- devel/py-Jinja2/Makefile +++ devel/py-Jinja2/Makefile @@ -69,11 +69,4 @@ (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .endif -check regression-test test: build -.if empty(PKGNAMESUFFIX) - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test -.else - @${DO_NADA} -.endif - .include Index: devel/py-TGScheduler/Makefile =================================================================== --- devel/py-TGScheduler/Makefile +++ devel/py-TGScheduler/Makefile @@ -20,7 +20,4 @@ post-patch: @${REINPLACE_CMD} -e 's,<2.0dev,!=2.0,g' ${WRKSRC}/setup.py -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: devel/py-apscheduler/Makefile =================================================================== --- devel/py-apscheduler/Makefile +++ devel/py-apscheduler/Makefile @@ -15,28 +15,21 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \ ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:${PORTSDIR}/devel/py-six \ ${PYTHON_PKGNAMEPREFIX}tzlocal>0:${PORTSDIR}/devel/py-tzlocal +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:${PORTSDIR}/devel/py-pytest NO_ARCH= yes USES= python USE_PYTHON= autoplist distutils - -OPTIONS_DEFINE= TEST - -TEST_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:${PORTSDIR}/devel/py-pytest -TEST_MAKE_ENV= TZ=UTC -PYDISTUTILS_TEST_TARGET?= test +TEST_ENV= ${MAKE_ENV} TZ=UTC .include -.if ${PORT_OPTIONS:MTEST} && ${PYTHON_REL} < 3300 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock +.if ${PYTHON_REL} < 3300 +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock .endif .if ${PYTHON_REL} < 3200 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:${PORTSDIR}/devel/py-futures .endif -pre-install-TEST-on: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_TEST_TARGET} ${PYDISTUTILS_TESTARGS}) - .include Index: devel/py-asn1/Makefile =================================================================== --- devel/py-asn1/Makefile +++ devel/py-asn1/Makefile @@ -19,7 +19,4 @@ USES= python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: devel/py-asyncio/Makefile =================================================================== --- devel/py-asyncio/Makefile +++ devel/py-asyncio/Makefile @@ -16,7 +16,4 @@ USES= python:3.3+ USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-biplist/Makefile =================================================================== --- devel/py-biplist/Makefile +++ devel/py-biplist/Makefile @@ -15,14 +15,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \ ${PYTHON_PKGNAMEPREFIX}coverage>=0:${PORTSDIR}/devel/py-coverage RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six -TEST_DEPENDS:= ${RUN_DEPENDS} USES= python USE_PYTHON= autoplist distutils -.include - -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - -.include +.include Index: devel/py-check-manifest/Makefile =================================================================== --- devel/py-check-manifest/Makefile +++ devel/py-check-manifest/Makefile @@ -27,7 +27,4 @@ ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-circuits/Makefile =================================================================== --- devel/py-circuits/Makefile +++ devel/py-circuits/Makefile @@ -18,7 +18,4 @@ USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: devel/py-dateutil/Makefile =================================================================== --- devel/py-dateutil/Makefile +++ devel/py-dateutil/Makefile @@ -20,7 +20,4 @@ USES= python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-doit/Makefile =================================================================== --- devel/py-doit/Makefile +++ devel/py-doit/Makefile @@ -19,7 +19,4 @@ USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: devel/py-fabric/Makefile =================================================================== --- devel/py-fabric/Makefile +++ devel/py-fabric/Makefile @@ -16,20 +16,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:${PORTSDIR}/security/py-paramiko -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=0.6:${PORTSDIR}/devel/py-Jinja2 \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0.6:${PORTSDIR}/devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}fudge>0:${PORTSDIR}/devel/py-fudge \ ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose -OPTIONS_DEFINE= TESTS -TESTS_DESC= Install nose for test suite - -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - USES= python:2.7 USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-filemagic/Makefile =================================================================== --- devel/py-filemagic/Makefile +++ devel/py-filemagic/Makefile @@ -14,11 +14,6 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - USES= python USE_GITHUB= yes USE_PYTHON= autoplist distutils @@ -32,7 +27,4 @@ TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2 .endif -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-foolscap/Makefile =================================================================== --- devel/py-foolscap/Makefile +++ devel/py-foolscap/Makefile @@ -19,7 +19,4 @@ USES= python twisted USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-freezegun/Makefile =================================================================== --- devel/py-freezegun/Makefile +++ devel/py-freezegun/Makefile @@ -21,7 +21,4 @@ USES= python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} nosetests - .include Index: devel/py-future/Makefile =================================================================== --- devel/py-future/Makefile +++ devel/py-future/Makefile @@ -16,7 +16,4 @@ USES= python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-lazy/Makefile =================================================================== --- devel/py-lazy/Makefile +++ devel/py-lazy/Makefile @@ -13,7 +13,4 @@ USES= python zip USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: devel/py-logan/Makefile =================================================================== --- devel/py-logan/Makefile +++ devel/py-logan/Makefile @@ -30,7 +30,4 @@ ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}/README.rst -check test: build - cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: devel/py-mock/Makefile =================================================================== --- devel/py-mock/Makefile +++ devel/py-mock/Makefile @@ -13,12 +13,9 @@ LICENSE= BSD2CLAUSE -OPTIONS_DEFINE= TESTS -TESTS_DESC= Install tox for running unit tests +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2 USES= python USE_PYTHON= distutils autoplist -TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:${PORTSDIR}/devel/py-tox - .include Index: devel/py-nose/Makefile =================================================================== --- devel/py-nose/Makefile +++ devel/py-nose/Makefile @@ -18,11 +18,10 @@ .include -regression-test: build +pre-test: # Extra tests for python 3, added in by setup3lib.py .if ${PYTHON_REL} >= 3000 @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} build_tests .endif - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test .include Index: devel/py-phabricator/Makefile =================================================================== --- devel/py-phabricator/Makefile +++ devel/py-phabricator/Makefile @@ -21,12 +21,4 @@ USES= python USE_PYTHON= autoplist distutils -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Include test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-pip/Makefile =================================================================== --- devel/py-pip/Makefile +++ devel/py-pip/Makefile @@ -53,7 +53,4 @@ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv") .endif -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-protobuf/Makefile =================================================================== --- devel/py-protobuf/Makefile +++ devel/py-protobuf/Makefile @@ -16,9 +16,7 @@ protoc:${PORTSDIR}/devel/protobuf RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google-apputils>=0:${PORTSDIR}/devel/py-google-apputils -DO_MAKE_TEST= ${PYTHON_CMD} ${PYDISTUTILS_SETUP} NO_ARCH= yes -TEST_TARGET= test USE_PYTHON= autoplist distutils USES= python tar:bzip2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/python Index: devel/py-pyflakes/Makefile =================================================================== --- devel/py-pyflakes/Makefile +++ devel/py-pyflakes/Makefile @@ -15,7 +15,4 @@ USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: devel/py-pygit2/Makefile =================================================================== --- devel/py-pygit2/Makefile +++ devel/py-pygit2/Makefile @@ -21,9 +21,6 @@ USE_PYTHON= autoplist distutils MAKE_ENV= LIBGIT2=${LOCALBASE} -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/*.so Index: devel/py-pygithub/Makefile =================================================================== --- devel/py-pygithub/Makefile +++ devel/py-pygithub/Makefile @@ -16,7 +16,4 @@ USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: devel/py-pytest-cache/Makefile =================================================================== --- devel/py-pytest-cache/Makefile +++ devel/py-pytest-cache/Makefile @@ -17,15 +17,7 @@ ${PYTHON_PKGNAMEPREFIX}execnet>=1.2:${PORTSDIR}/sysutils/py-execnet TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - USES= python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-pytest/Makefile =================================================================== --- devel/py-pytest/Makefile +++ devel/py-pytest/Makefile @@ -20,12 +20,4 @@ USES= python USE_PYTHON= autoplist distutils -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-python-bugzilla/Makefile =================================================================== --- devel/py-python-bugzilla/Makefile +++ devel/py-python-bugzilla/Makefile @@ -18,7 +18,4 @@ USES= python zip USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-sanetime/Makefile =================================================================== --- devel/py-sanetime/Makefile +++ devel/py-sanetime/Makefile @@ -17,17 +17,7 @@ ${PYTHON_PKGNAMEPREFIX}pytz>=2010:${PORTSDIR}/devel/py-pytz TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2:${PORTSDIR}/devel/py-unittest2 -OPTIONS_DEFINE= TESTS -TESTS_DESC= Include tools for unit tests - USES= python:2 USE_PYTHON= distutils autoplist -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - -.include - -regression-test: build - cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: devel/py-scripttest/Makefile =================================================================== --- devel/py-scripttest/Makefile +++ devel/py-scripttest/Makefile @@ -19,7 +19,4 @@ USE_GITHUB= yes GH_ACCOUNT= pypa -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-semantic_version/Makefile =================================================================== --- devel/py-semantic_version/Makefile +++ devel/py-semantic_version/Makefile @@ -15,11 +15,6 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - USE_GITHUB= yes GH_ACCOUNT= rbarrois GH_PROJECT= python-semanticversion @@ -27,7 +22,4 @@ USES= python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-setuptools/Makefile =================================================================== --- devel/py-setuptools/Makefile +++ devel/py-setuptools/Makefile @@ -39,7 +39,4 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/ -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-simplejson/Makefile =================================================================== --- devel/py-simplejson/Makefile +++ devel/py-simplejson/Makefile @@ -19,7 +19,4 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -regression-test test: build - cd ${WRKSRC}/ && ${PYTHON_CMD} ${PYSETUP} test - .include Index: devel/py-tox/Makefile =================================================================== --- devel/py-tox/Makefile +++ devel/py-tox/Makefile @@ -31,7 +31,4 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse .endif -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: devel/py-twiggy/Makefile =================================================================== --- devel/py-twiggy/Makefile +++ devel/py-twiggy/Makefile @@ -16,9 +16,6 @@ USES= python USE_PYTHON= autoplist distutils - -regression-test: build - @cd ${WRKSRC} && ${SETENV} TWIGGY_UNDER_TEST=1 \ - ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test +TEST_ENV= ${MAKE_ENV} TWIGGY_UNDER_TEST=1 .include Index: devel/py-tzlocal/Makefile =================================================================== --- devel/py-tzlocal/Makefile +++ devel/py-tzlocal/Makefile @@ -13,20 +13,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz -OPTIONS_DEFINE= TEST -OPTIONS_DEFAULT= TEST -TEST_DESC= Run test suite - USES= python zip USE_PYTHON= distutils autoplist -.include - -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - -.if !empty(PORT_OPTIONS:MTEST) -pre-install: regression-test -.endif - .include Index: devel/py-virtualenv/Makefile =================================================================== --- devel/py-virtualenv/Makefile +++ devel/py-virtualenv/Makefile @@ -36,7 +36,4 @@ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -or -name objects.inv") .endif -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: finance/py-stripe/Makefile =================================================================== --- finance/py-stripe/Makefile +++ finance/py-stripe/Makefile @@ -17,18 +17,9 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}curl>=7.19:${PORTSDIR}/ftp/py-curl \ ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:${PORTSDIR}/devel/py-mock -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${RUN_DEPENDS} \ - ${TEST_DEPENDS} - USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes -regression-test: build - @cd ${WRKSRC} && ${SETENV} SKIP_PYCURL_TESTS=no ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: ftp/py-pyftpdlib/Makefile =================================================================== --- ftp/py-pyftpdlib/Makefile +++ ftp/py-pyftpdlib/Makefile @@ -30,8 +30,7 @@ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${CP} -R ${WRKSRC}/demo/ ${STAGEDIR}${EXAMPLESDIR} -test: build +pre-test: ${TOUCH} ${WRKSRC}/test/__init__.py - cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test .include Index: math/py-graphillion/Makefile =================================================================== --- math/py-graphillion/Makefile +++ math/py-graphillion/Makefile @@ -18,7 +18,4 @@ USE_GITHUB= yes GH_ACCOUNT= takemaru -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: math/py-pycosat/Makefile =================================================================== --- math/py-pycosat/Makefile +++ math/py-pycosat/Makefile @@ -27,7 +27,4 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/pycosat.so -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: net/py-beanstalkc/Makefile =================================================================== --- net/py-beanstalkc/Makefile +++ net/py-beanstalkc/Makefile @@ -24,7 +24,4 @@ YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: net/py-eventlet/Makefile =================================================================== --- net/py-eventlet/Makefile +++ net/py-eventlet/Makefile @@ -18,7 +18,4 @@ USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: net/py-netaddr/Makefile =================================================================== --- net/py-netaddr/Makefile +++ net/py-netaddr/Makefile @@ -24,7 +24,4 @@ @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: net/py-oauth2/Makefile =================================================================== --- net/py-oauth2/Makefile +++ net/py-oauth2/Makefile @@ -14,18 +14,10 @@ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2 -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}coverage>0:${PORTSDIR}/devel/py-coverage \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:${PORTSDIR}/devel/py-coverage \ ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock -OPTIONS_DEFINE= TESTS -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - USES= python:-2.7 USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: net/py-pynsq/Makefile =================================================================== --- net/py-pynsq/Makefile +++ net/py-pynsq/Makefile @@ -18,21 +18,9 @@ ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \ ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock -OPTIONS_DEFINE= TESTS -TESTS_DESC= Install tools to run test suite - USES= python USE_PYTHON= distutils autoplist USE_GITHUB= yes GH_ACCOUNT= bitly -.include - -.if ${PORT_OPTIONS:MTESTS} -BUILD_DEPENDS:= ${TEST_DEPENDS} -.endif - -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: net/py-pyzmq/Makefile =================================================================== --- net/py-pyzmq/Makefile +++ net/py-pyzmq/Makefile @@ -17,14 +17,11 @@ USES= python USE_PYTHON= distutils autoplist -.include - pre-configure: @${SED} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/setup.cfg.template > \ ${WRKSRC}/setup.cfg -regression-test: extract +pre-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} build_ext --inplace - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test -.include +.include Index: net/py-twitter-tools/Makefile =================================================================== --- net/py-twitter-tools/Makefile +++ net/py-twitter-tools/Makefile @@ -22,7 +22,4 @@ GH_ACCOUNT= sixohsix -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: net/turses/Makefile =================================================================== --- net/turses/Makefile +++ net/turses/Makefile @@ -16,18 +16,9 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \ ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${RUN_DEPENDS} \ - ${TEST_DEPENDS} - USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: science/py-h5py/Makefile =================================================================== --- science/py-h5py/Makefile +++ science/py-h5py/Makefile @@ -35,7 +35,4 @@ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${EXAMPLESDIR} -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: security/py-cryptography/Makefile =================================================================== --- security/py-cryptography/Makefile +++ security/py-cryptography/Makefile @@ -33,7 +33,4 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34 .endif -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: security/py-ecdsa/Makefile =================================================================== --- security/py-ecdsa/Makefile +++ security/py-ecdsa/Makefile @@ -16,7 +16,4 @@ USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: security/py-libnacl/Makefile =================================================================== --- security/py-libnacl/Makefile +++ security/py-libnacl/Makefile @@ -18,8 +18,7 @@ USES= python USE_PYTHON= autoplist distutils -regression-test: build +pre-test: ${TOUCH} ${WRKSRC}/tests/__init__.py - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test .include Index: security/py-oauthlib/Makefile =================================================================== --- security/py-oauthlib/Makefile +++ security/py-oauthlib/Makefile @@ -18,7 +18,7 @@ ${PYTHON_PKGNAMEPREFIX}pyjwt>0:${PORTSDIR}/www/py-pyjwt \ ${PYTHON_PKGNAMEPREFIX}blinker>0:${PORTSDIR}/devel/py-blinker -OPTIONS_DEFINE= RSA SIGNALS SIGNEDTOKEN TESTS +OPTIONS_DEFINE= RSA SIGNALS SIGNEDTOKEN OPTIONS_DEFAULT= RSA SIGNALS SIGNEDTOKEN RSA_DESC= Enable RSA Support @@ -31,9 +31,6 @@ SIGNEDTOKEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \ ${PYTHON_PKGNAMEPREFIX}pyjwt>0:${PORTSDIR}/www/py-pyjwt -TESTS_DESC= Include test suite dependencies -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - USES= python USE_PYTHON= distutils autoplist @@ -43,7 +40,4 @@ TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2 .endif -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: security/py-openssl/Makefile =================================================================== --- security/py-openssl/Makefile +++ security/py-openssl/Makefile @@ -31,7 +31,4 @@ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) -regression-test: build - @(cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test) - .include Index: security/py-pycrypto/Makefile =================================================================== --- security/py-pycrypto/Makefile +++ security/py-pycrypto/Makefile @@ -31,7 +31,4 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Crypto/*/*.so -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: security/py-pysha3/Makefile =================================================================== --- security/py-pysha3/Makefile +++ security/py-pysha3/Makefile @@ -16,7 +16,4 @@ USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: sysutils/py-nagiosplugin/Makefile =================================================================== --- sysutils/py-nagiosplugin/Makefile +++ sysutils/py-nagiosplugin/Makefile @@ -16,7 +16,4 @@ USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: sysutils/py-supervisor/Makefile =================================================================== --- sysutils/py-supervisor/Makefile +++ sysutils/py-supervisor/Makefile @@ -13,17 +13,7 @@ COMMENT= System to monitor and control a number of processes on UNIX-like OS RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:${PORTSDIR}/www/py-meld3 -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock - -OPTIONS_DEFINE= TESTS -TESTS_DESC= Install mock for running unit tests - -.include - -.if ${PORT_OPTIONS:MTESTS} -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock -.endif +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock PORTDOCS= *.txt *.rst @@ -46,7 +36,4 @@ ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ .endfor -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: textproc/py-diff-match-patch/Makefile =================================================================== --- textproc/py-diff-match-patch/Makefile +++ textproc/py-diff-match-patch/Makefile @@ -21,7 +21,4 @@ NO_ARCH= yes -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: textproc/py-mistune/Makefile =================================================================== --- textproc/py-mistune/Makefile +++ textproc/py-mistune/Makefile @@ -18,7 +18,4 @@ USES= python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: textproc/py-transifex-client/Makefile =================================================================== --- textproc/py-transifex-client/Makefile +++ textproc/py-transifex-client/Makefile @@ -19,7 +19,4 @@ GH_ACCOUNT= transifex -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: textproc/py-wtforms/Makefile =================================================================== --- textproc/py-wtforms/Makefile +++ textproc/py-wtforms/Makefile @@ -20,10 +20,6 @@ ${PYTHON_PKGNAMEPREFIX}pep8>0:${PORTSDIR}/devel/pep8 \ ${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil -OPTIONS_DEFINE= TESTS -TESTS_DESC= Install test suite dependencies -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - USES= python zip USE_PYTHON= autoplist distutils @@ -35,7 +31,4 @@ (cd ${WRKSRC}/docs/html/ && ${CP} *.html ${STAGEDIR}${DOCSDIR}/) (cd ${WRKSRC}/docs/html/ && ${CP} *.js ${STAGEDIR}${DOCSDIR}/) -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/geeknote/Makefile =================================================================== --- www/geeknote/Makefile +++ www/geeknote/Makefile @@ -25,7 +25,4 @@ GH_ACCOUNT= VitaliyRodnenko GH_TAGNAME= 7ea2255 -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-aiohttp/Makefile =================================================================== --- www/py-aiohttp/Makefile +++ www/py-aiohttp/Makefile @@ -14,14 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:${PORTSDIR}/textproc/py-chardet -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \ ${PYTHON_PKGNAMEPREFIX}gunicorn>0:${PORTSDIR}/www/py-gunicorn -OPTIONS_DEFINE= TESTS -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - USES= python:3.3+ USE_PYTHON= autoplist distutils @@ -34,7 +29,4 @@ IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-bleach/Makefile =================================================================== --- www/py-bleach/Makefile +++ www/py-bleach/Makefile @@ -18,15 +18,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>=0.999:${PORTSDIR}/www/py-html5lib \ ${PYTHON_PKGNAMEPREFIX}nose>=1.3:${PORTSDIR}/devel/py-nose -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - USES= python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-cactus/Makefile =================================================================== --- www/py-cactus/Makefile +++ www/py-cactus/Makefile @@ -28,14 +28,4 @@ USES= python:-2.7 USE_PYTHON= autoplist concurrent distutils -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Install test suite requirements - -TESTS_BUILD_DEPENDS= ${RUN_DEPENDS} \ - ${TEST_DEPENDS} - -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-django-contrib-comments/Makefile =================================================================== --- www/py-django-contrib-comments/Makefile +++ www/py-django-contrib-comments/Makefile @@ -14,12 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django # >= 1.5 -TEST_DEPENDS:= ${RUN_DEPENDS} USES= python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-django-mezzanine/Makefile =================================================================== --- www/py-django-mezzanine/Makefile +++ www/py-django-mezzanine/Makefile @@ -32,7 +32,4 @@ USES= gettext python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: www/py-feedgenerator/Makefile =================================================================== --- www/py-feedgenerator/Makefile +++ www/py-feedgenerator/Makefile @@ -19,7 +19,4 @@ USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: www/py-flask-wtf/Makefile =================================================================== --- www/py-flask-wtf/Makefile +++ www/py-flask-wtf/Makefile @@ -18,15 +18,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \ ${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:${PORTSDIR}/devel/py-flask-babel -OPTIONS_DEFINE= TESTS -TESTS_DESC= Install test suite dependencies -TESTS_BUILD_DEPENDS= ${RUN_DEPENDS} \ - ${TEST_DEPENDS} - USES= python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-flexget/Makefile =================================================================== --- www/py-flexget/Makefile +++ www/py-flexget/Makefile @@ -36,14 +36,10 @@ ${PYTHON_PKGNAMEPREFIX}apscheduler>0:${PORTSDIR}/devel/py-apscheduler \ ${PYTHON_PKGNAMEPREFIX}guessit>=0.9.3:${PORTSDIR}/multimedia/py-guessit \ ${PYTHON_PKGNAMEPREFIX}path.py>=6.2:${PORTSDIR}/devel/py-path.py -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \ ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock USES= python:2 USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: www/py-gandi.cli/Makefile =================================================================== --- www/py-gandi.cli/Makefile +++ www/py-gandi.cli/Makefile @@ -20,12 +20,6 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \ ${PYTHON_PKGNAMEPREFIX}coverage>0:${PORTSDIR}/devel/py-coverage -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${RUN_DEPENDS} \ - ${TEST_DEPENDS} - USES= python USE_PYTHON= autoplist concurrent distutils @@ -35,7 +29,4 @@ TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock .endif -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-grequests/Makefile =================================================================== --- www/py-grequests/Makefile +++ www/py-grequests/Makefile @@ -16,13 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>0:${PORTSDIR}/devel/py-gevent \ ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:${PORTSDIR}/www/py-requests -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose - -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose USE_GITHUB= yes GH_ACCOUNT= kennethreitz @@ -30,7 +24,4 @@ USES= python USE_PYTHON= autoplist distutils -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-gunicorn/Makefile =================================================================== --- www/py-gunicorn/Makefile +++ www/py-gunicorn/Makefile @@ -14,7 +14,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest -OPTIONS_DEFINE= SETPROC TESTS +OPTIONS_DEFINE= SETPROC OPTIONS_GROUP= WORKERS OPTIONS_GROUP_WORKERS= EVENTLET GEVENT TORNADO @@ -22,13 +22,11 @@ GEVENT_DESC= Gevent async worker support TORNADO_DESC= Tornado async worker support SETPROC_DESC= Support custom process names (setproctitle) -TESTS_DESC= Install pytest for unit tests EVENTLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.7:${PORTSDIR}/net/py-eventlet GEVENT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0.12.2:${PORTSDIR}/devel/py-gevent TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=2.2:${PORTSDIR}/www/py-tornado SETPROC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setproctitle>0:${PORTSDIR}/devel/py-setproctitle -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} USE_GITHUB= yes USES= python @@ -36,7 +34,4 @@ GH_ACCOUNT= benoitc -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: www/py-pelican/Makefile =================================================================== --- www/py-pelican/Makefile +++ www/py-pelican/Makefile @@ -28,7 +28,7 @@ GH_ACCOUNT= getpelican -OPTIONS_DEFINE= MARKDOWN SYNTAX TESTS +OPTIONS_DEFINE= MARKDOWN SYNTAX OPTIONS_DEFAULT= MARKDOWN SYNTAX MARKDOWN_DESC= Markdown markup language format support @@ -37,11 +37,4 @@ SYNTAX_DESC= Syntax Highlighting (via pygments) SYNTAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.4:${PORTSDIR}/textproc/py-pygments -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} \ - ${RUN_DEPENDS} - -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-praw/Makefile =================================================================== --- www/py-praw/Makefile +++ www/py-praw/Makefile @@ -15,7 +15,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests1>=1.2.0:${PORTSDIR}/www/py-requests1 \ ${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six -TEST_DEPENDS:= ${RUN_DEPENDS} USE_GITHUB= yes USES= python @@ -23,7 +22,4 @@ GH_ACCOUNT= praw-dev -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: www/py-pyjwt/Makefile =================================================================== --- www/py-pyjwt/Makefile +++ www/py-pyjwt/Makefile @@ -21,7 +21,4 @@ USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-rackspace-monitoring/Makefile =================================================================== --- www/py-rackspace-monitoring/Makefile +++ www/py-rackspace-monitoring/Makefile @@ -18,7 +18,4 @@ USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-requests-oauthlib/Makefile =================================================================== --- www/py-requests-oauthlib/Makefile +++ www/py-requests-oauthlib/Makefile @@ -18,15 +18,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Install test suite dependencies -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - USES= python USE_PYTHON= distutils autoplist -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - .include Index: www/py-requests/Makefile =================================================================== --- www/py-requests/Makefile +++ www/py-requests/Makefile @@ -20,7 +20,4 @@ CONFLICTS_INSTALL= py*-requests1-* -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-slimit/Makefile =================================================================== --- www/py-slimit/Makefile +++ www/py-slimit/Makefile @@ -26,7 +26,4 @@ @cd ${WRKSRC} && 2to3-${PYTHON_VER} -w src .endif -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include Index: www/py-slumber/Makefile =================================================================== --- www/py-slumber/Makefile +++ www/py-slumber/Makefile @@ -18,10 +18,7 @@ ${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2 \ ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock -OPTIONS_DEFINE= TESTS YAML - -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} +OPTIONS_DEFINE= YAML YAML_DESC= YAML serializer support YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml @@ -32,7 +29,4 @@ USE_GITHUB= yes GH_ACCOUNT= samgiles -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - .include