svn commit: r561394 - in head: devel/py-mock devel/py-pyee devel/py-vcrpy finance/py-stripe net/py-pyzmq www/py-autobahn www/py-webargs

Rene Ladan rene at FreeBSD.org
Tue Jan 12 22:03:53 UTC 2021


Author: rene
Date: Tue Jan 12 22:03:51 2021
New Revision: 561394
URL: https://svnweb.freebsd.org/changeset/ports/561394

Log:
  Simplify some ports using PYTHON_VER and Python 3.6+

Modified:
  head/devel/py-mock/Makefile
  head/devel/py-pyee/Makefile
  head/devel/py-vcrpy/Makefile
  head/finance/py-stripe/Makefile
  head/net/py-pyzmq/Makefile
  head/www/py-autobahn/Makefile
  head/www/py-webargs/Makefile

Modified: head/devel/py-mock/Makefile
==============================================================================
--- head/devel/py-mock/Makefile	Tue Jan 12 22:01:54 2021	(r561393)
+++ head/devel/py-mock/Makefile	Tue Jan 12 22:03:51 2021	(r561394)
@@ -23,13 +23,7 @@ NO_ARCH=	yes
 
 GH_ACCOUNT=	testing-cabal
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_VER} < 3.3
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}funcsigs>=1:devel/py-funcsigs@${PY_FLAVOR}
-.endif
-
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts=
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/py-pyee/Makefile
==============================================================================
--- head/devel/py-pyee/Makefile	Tue Jan 12 22:01:54 2021	(r561393)
+++ head/devel/py-pyee/Makefile	Tue Jan 12 22:03:51 2021	(r561394)
@@ -12,15 +12,10 @@ COMMENT=	Python EventEmitter implementation
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_VER} > 3.4
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/py-vcrpy/Makefile
==============================================================================
--- head/devel/py-vcrpy/Makefile	Tue Jan 12 22:01:54 2021	(r561393)
+++ head/devel/py-vcrpy/Makefile	Tue Jan 12 22:03:51 2021	(r561394)
@@ -15,7 +15,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yarl>0:www/py-yarl@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+
@@ -26,15 +27,4 @@ NO_ARCH=	yes
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_VER} < 3.3
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR}
-.endif
-
-.if ${PYTHON_VER} >= 3.4
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}yarl>0:www/py-yarl@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/finance/py-stripe/Makefile
==============================================================================
--- head/finance/py-stripe/Makefile	Tue Jan 12 22:01:54 2021	(r561393)
+++ head/finance/py-stripe/Makefile	Tue Jan 12 22:03:51 2021	(r561394)
@@ -27,12 +27,4 @@ NO_ARCH=	yes
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
-.include <bsd.port.pre.mk>
-
-# requests[security]
-.if ${PYTHON_VER} < 3.0
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/py-pyzmq/Makefile
==============================================================================
--- head/net/py-pyzmq/Makefile	Tue Jan 12 22:01:54 2021	(r561393)
+++ head/net/py-pyzmq/Makefile	Tue Jan 12 22:03:51 2021	(r561394)
@@ -23,12 +23,6 @@ USE_PYTHON=	distutils autoplist
 
 PYDISTUTILS_CONFIGUREARGS=	--zmq=${LOCALBASE}
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_VER} == 3.3
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}asyncio>0:devel/py-asyncio@${PY_FLAVOR}
-.endif
-
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} build_ext --inplace
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
@@ -37,4 +31,4 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/zmq/backend/cython/*.so
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/zmq/devices/*.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/py-autobahn/Makefile
==============================================================================
--- head/www/py-autobahn/Makefile	Tue Jan 12 22:01:54 2021	(r561393)
+++ head/www/py-autobahn/Makefile	Tue Jan 12 22:03:51 2021	(r561394)
@@ -62,15 +62,11 @@ SERIALIZATION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgp
 TWISTED_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}twisted>=12.1.0:devel/py-twisted@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface@${PY_FLAVOR}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${PYTHON_VER} > 3.0
 OPTIONS_MULTI_BACKENDS:=	${OPTIONS_MULTI_BACKENDS:NASYNCIO}
 COMPLETE_OPTIONS_LIST:=		${COMPLETE_OPTIONS_LIST:NASYNCIO}
 PORT_OPTIONS:=			${PORT_OPTIONS:NASYNCIO}
-.elif ${PORT_OPTIONS:MASYNCIO}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}trollius>=2.0:devel/py-trollius@${PY_FLAVOR}
-.endif
 
 do-test:
 .if ${PORT_OPTIONS:MASYNCIO}
@@ -80,4 +76,4 @@ do-test:
 	@cd ${WRKSRC} && USE_TWISTED=1 ${PYTHON_CMD} -m twisted.trial ${WRKSRC}/autobahn
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/py-webargs/Makefile
==============================================================================
--- head/www/py-webargs/Makefile	Tue Jan 12 22:01:54 2021	(r561393)
+++ head/www/py-webargs/Makefile	Tue Jan 12 22:03:51 2021	(r561394)
@@ -37,10 +37,4 @@ do-test:
 		--ignore-glob='*test_aiohttpparser*' \
 		--ignore-glob="*test_tornadoparser*"
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_VER} < 3
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.0:devel/py-simplejson@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>


More information about the svn-ports-all mailing list