diff options
-rw-r--r-- | Mk/Uses/python.mk | 6 | ||||
-rw-r--r-- | databases/mongodb36/Makefile | 2 | ||||
-rw-r--r-- | databases/mongodb40/Makefile | 2 | ||||
-rw-r--r-- | devel/py-astroid/Makefile | 9 | ||||
-rw-r--r-- | devel/py-curtsies/Makefile | 9 | ||||
-rw-r--r-- | devel/py-fs2/Makefile | 5 | ||||
-rw-r--r-- | devel/py-importlib-resources/Makefile | 5 | ||||
-rw-r--r-- | devel/py-molecule/Makefile | 4 | ||||
-rw-r--r-- | devel/py-mypy/Makefile | 11 | ||||
-rw-r--r-- | devel/py-mypy_extensions/Makefile | 10 | ||||
-rw-r--r-- | devel/py-pipenv/Makefile | 9 | ||||
-rw-r--r-- | devel/py-promise/Makefile | 11 | ||||
-rw-r--r-- | devel/py-typing-extensions/Makefile | 10 | ||||
-rw-r--r-- | graphics/py-geomdl/Makefile | 6 | ||||
-rw-r--r-- | net-mgmt/py-msrest/Makefile | 11 | ||||
-rw-r--r-- | print/py-fonttools/Makefile | 6 | ||||
-rw-r--r-- | security/py-m2crypto/Makefile | 9 | ||||
-rw-r--r-- | textproc/py-orange3-text/Makefile | 2 | ||||
-rw-r--r-- | textproc/py-sphinx/Makefile | 9 | ||||
-rw-r--r-- | textproc/scancode-toolkit/Makefile | 2 | ||||
-rw-r--r-- | www/py-django-extensions/Makefile | 11 | ||||
-rw-r--r-- | www/py-python-dotenv/Makefile | 11 |
22 files changed, 50 insertions, 110 deletions
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index e7724b7bac55..346ea1173741 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -659,6 +659,12 @@ PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} # Common Python modules that can be needed but only for some versions of Python. +.if ${PYTHON_REL} < 3500 +PY_TYPING= ${PYTHON_PKGNAMEPREFIX}typing>=3.6.4:devel/py-typing@${PY_FLAVOR} +.else +PY_TYPING= +.endif + .if ${PYTHON_REL} < 3400 PY_ENUM34= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${PY_FLAVOR} PY_ENUM_COMPAT= ${PYTHON_PKGNAMEPREFIX}enum-compat>0:devel/py-enum-compat@${PY_FLAVOR} diff --git a/databases/mongodb36/Makefile b/databases/mongodb36/Makefile index f7aa11940a5a..3843171e5bcb 100644 --- a/databases/mongodb36/Makefile +++ b/databases/mongodb36/Makefile @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= amd64 aarch64 ONLY_FOR_ARCHS_REASON= "Only supported on amd64 and aarch64 (i386 deprecated in v3)" BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}typing>=3.6.2:devel/py-typing@${PY_FLAVOR} \ + ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libpcre.so:devel/pcre \ diff --git a/databases/mongodb40/Makefile b/databases/mongodb40/Makefile index a972c4b51a12..35761351dfc8 100644 --- a/databases/mongodb40/Makefile +++ b/databases/mongodb40/Makefile @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= "Only supported on amd64 and aarch64 (i386 deprecated in v3)" BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}typing>=3.6.2:devel/py-typing@${PY_FLAVOR} \ + ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ ${LOCALBASE}/bin/ar:devel/binutils LIB_DEPENDS= libboost_system.so:devel/boost-libs \ diff --git a/devel/py-astroid/Makefile b/devel/py-astroid/Makefile index 52a8cf401336..822866ac3c5c 100644 --- a/devel/py-astroid/Makefile +++ b/devel/py-astroid/Makefile @@ -16,6 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>=0:devel/py-lazy-object-proxy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typed-ast>=1.3.0:devel/py-typed-ast@${PY_FLAVOR} \ + ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}wrapt>=0:devel/py-wrapt@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} @@ -24,13 +25,7 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} -.endif - do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-curtsies/Makefile b/devel/py-curtsies/Makefile index 31792b898831..f8958160cd22 100644 --- a/devel/py-curtsies/Makefile +++ b/devel/py-curtsies/Makefile @@ -15,16 +15,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blessings>=1.5:devel/py-blessings@${PY_FLAVOR} \ + ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:devel/py-wcwidth@${PY_FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils USES= python -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-fs2/Makefile b/devel/py-fs2/Makefile index b69ac417a3e2..093dc1cf2b77 100644 --- a/devel/py-fs2/Makefile +++ b/devel/py-fs2/Makefile @@ -16,6 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.3:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${PY_FLAVOR} \ + ${PY_TYPING} \ ${PY_ENUM34} USES= python @@ -34,8 +35,4 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.os>=0.1:devel/py-backports.os@${P RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}scandir>=1.5:sysutils/py-scandir@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=3.6:devel/py-typing@${PY_FLAVOR} -.endif - .include <bsd.port.post.mk> diff --git a/devel/py-importlib-resources/Makefile b/devel/py-importlib-resources/Makefile index 3712ee8a0aa1..6488216178eb 100644 --- a/devel/py-importlib-resources/Makefile +++ b/devel/py-importlib-resources/Makefile @@ -14,6 +14,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PY_TYPING} USES= python USE_PYTHON= distutils autoplist @@ -24,8 +25,4 @@ USE_PYTHON= distutils autoplist RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} -.endif - .include <bsd.port.post.mk> diff --git a/devel/py-molecule/Makefile b/devel/py-molecule/Makefile index d6dc6b27613e..9b19a151f3c5 100644 --- a/devel/py-molecule/Makefile +++ b/devel/py-molecule/Makefile @@ -29,6 +29,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ansible-lint>=4.0.2:sysutils/py-ansible-lint ${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.2:devel/py-tabulate@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}testinfra>=1.19.0:devel/py-testinfra@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tree-format>=0.1.2:devel/py-tree-format@${PY_FLAVOR} \ + ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}yamllint>=1.11.1:devel/py-yamllint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>=4.6.0:misc/py-pexpect@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.7:devel/py-pytest@${PY_FLAVOR} \ @@ -52,8 +53,7 @@ TEST_ENV= LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 .include <bsd.port.pre.mk> .if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}functools32>=0:devel/py-functools32@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>=0:devel/py-functools32@${PY_FLAVOR} .endif do-test: diff --git a/devel/py-mypy/Makefile b/devel/py-mypy/Makefile index 286d82bc4597..c4872bdd91d3 100644 --- a/devel/py-mypy/Makefile +++ b/devel/py-mypy/Makefile @@ -16,7 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typed-ast>=1.3.1:devel/py-typed-ast@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.4.0:sysutils/py-psutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mypy_extensions>=0:devel/py-mypy_extensions@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}mypy_extensions>=0:devel/py-mypy_extensions@${PY_FLAVOR} \ + ${PY_TYPING} USES= python:3.4+ shebangfix USE_PYTHON= autoplist concurrent distutils @@ -24,13 +25,7 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes SHEBANG_FILES= mypy/typeshed/tests/*.py -.include <bsd.port.pre.mk> - -.if ${PYTHON_VER} < 3.5 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=3.5.3:devel/py-typing@${PY_FLAVOR} -.endif - do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-mypy_extensions/Makefile b/devel/py-mypy_extensions/Makefile index 2a5dadfc39d9..1d6a36e454ff 100644 --- a/devel/py-mypy_extensions/Makefile +++ b/devel/py-mypy_extensions/Makefile @@ -12,15 +12,11 @@ COMMENT= Experimental type system extensions for programs LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +RUN_DEPENDS= ${PY_TYPING} + USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_VER} < 3.5 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=3.5.3:devel/py-typing@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-pipenv/Makefile b/devel/py-pipenv/Makefile index 4ca1c7193bd9..96fee04fd754 100644 --- a/devel/py-pipenv/Makefile +++ b/devel/py-pipenv/Makefile @@ -19,6 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}invoke>=0:devel/py-invoke@${PY_FLAVOR} \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \ ${PY_ENUM34} \ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${PY_FLAVOR} \ + ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv-clone>=0.2.5:devel/py-virtualenv-clone@${PY_FLAVOR} @@ -27,10 +28,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-promise/Makefile b/devel/py-promise/Makefile index e538f5e1ebad..a4b4f661ba75 100644 --- a/devel/py-promise/Makefile +++ b/devel/py-promise/Makefile @@ -13,17 +13,12 @@ COMMENT= Promises/A+ implementation for Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ + ${PY_TYPING} USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=3.6.4:devel/py-typing@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-typing-extensions/Makefile b/devel/py-typing-extensions/Makefile index 433368310d79..0ec1d35e473e 100644 --- a/devel/py-typing-extensions/Makefile +++ b/devel/py-typing-extensions/Makefile @@ -14,15 +14,11 @@ COMMENT= Backported and Experimental Type Hints for Python 3.5+ LICENSE= PSFL LICENSE_FILE= ${WRKSRC}/LICENSE +RUN_DEPENDS= ${PY_TYPING} + USES= python:-3.6 USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=3.6.2:devel/py-typing@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/py-geomdl/Makefile b/graphics/py-geomdl/Makefile index 402c4ba01664..7ab814dc4086 100644 --- a/graphics/py-geomdl/Makefile +++ b/graphics/py-geomdl/Makefile @@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.15.4:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.3:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR} -py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=1.5:devel/py-backports.functools_lru_cache@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR} \ + ${PY_TYPING} +py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=1.5:devel/py-backports.functools_lru_cache@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.0:devel/py-pytest@${PY_FLAVOR} USES= python diff --git a/net-mgmt/py-msrest/Makefile b/net-mgmt/py-msrest/Makefile index 840b173919ff..5fea281ce520 100644 --- a/net-mgmt/py-msrest/Makefile +++ b/net-mgmt/py-msrest/Makefile @@ -16,17 +16,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${PY_ ${PY_ENUM34} \ ${PYTHON_PKGNAMEPREFIX}isodate>=0.6.0:devel/py-isodate@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.16:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.5.0:www/py-requests-oauthlib@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.5.0:www/py-requests-oauthlib@${PY_FLAVOR} \ + ${PY_TYPING} USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/print/py-fonttools/Makefile b/print/py-fonttools/Makefile index cd00e509ad0e..eda98a1f4c8a 100644 --- a/print/py-fonttools/Makefile +++ b/print/py-fonttools/Makefile @@ -31,7 +31,8 @@ WOFF_DESC= Compress/uncompress WOFF webfonts GRAPHITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lz4>=1.7.4.2:archivers/py-lz4@${PY_FLAVOR} INTERPOLATABLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.0<5:devel/py-lxml@${PY_FLAVOR} +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.0<5:devel/py-lxml@${PY_FLAVOR} \ + ${PY_TYPING} PLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} SYMFONT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>=0:math/py-sympy@${PY_FLAVOR} UFO_RUN_DEPENDS= ${PY_ENUM34} \ @@ -45,9 +46,6 @@ WOFF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}brotli>=1.0.1:archivers/py-brotli@${PY_ .if ${PYTHON_REL} < 3400 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=3.4.0.3:devel/py-singledispatch@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} -.endif .endif .if ${PORT_OPTIONS:MUNICODE} diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile index 471ad0bfa81e..17db476879e2 100644 --- a/security/py-m2crypto/Makefile +++ b/security/py-m2crypto/Makefile @@ -15,6 +15,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE BUILD_DEPENDS= swig3.0:devel/swig30 +RUN_DEPENDS= ${PY_TYPING} USES= python ssl USE_PYTHON= autoplist concurrent distutils @@ -27,10 +28,4 @@ post-patch: post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/M2Crypto/_m2crypto.so -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/py-orange3-text/Makefile b/textproc/py-orange3-text/Makefile index b254ee8f4e9a..24cb34bc5e5e 100644 --- a/textproc/py-orange3-text/Makefile +++ b/textproc/py-orange3-text/Makefile @@ -27,10 +27,10 @@ RUN_DEPENDS= orange3>0:misc/orange3 \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simhash>0:math/py-simhash@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tweepy>0:net/py-tweepy@${PY_FLAVOR} \ + ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}ufal.udpipe>0:textproc/py-ufal.udpipe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}validate_email>0:mail/py-validate_email@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wikipedia>0:www/py-wikipedia@${PY_FLAVOR} -py34_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typing>0:devel/py-typing@${PY_FLAVOR} USES= python:3.4+ USE_GITHUB= yes diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile index 61a3fefddd0c..f7cf7573f7b2 100644 --- a/textproc/py-sphinx/Makefile +++ b/textproc/py-sphinx/Makefile @@ -34,6 +34,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.18.1:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize@${PY_FLAVOR} \ + ${PY_TYPING} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ @@ -44,10 +45,4 @@ USES= python USE_PYTHON= autoplist distutils concurrent NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/scancode-toolkit/Makefile b/textproc/scancode-toolkit/Makefile index e2a82690a144..b9f2f551cd40 100644 --- a/textproc/scancode-toolkit/Makefile +++ b/textproc/scancode-toolkit/Makefile @@ -48,7 +48,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nltk>=3.2:textproc/py-nltk@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pluggy>=0.4.0:devel/py-pluggy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}attrs>=17.4:devel/py-attrs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}typing>=3.6:devel/py-typing@${PY_FLAVOR} \ + ${PY_TYPING} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} \ diff --git a/www/py-django-extensions/Makefile b/www/py-django-extensions/Makefile index 9e7bad4597f9..66d49cf63db8 100644 --- a/www/py-django-extensions/Makefile +++ b/www/py-django-extensions/Makefile @@ -14,7 +14,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.2:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.2:devel/py-six@${PY_FLAVOR} \ + ${PY_TYPING} USES= python USE_PYTHON= autoplist distutils @@ -23,10 +24,4 @@ NO_ARCH= yes CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-extensions -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/py-python-dotenv/Makefile b/www/py-python-dotenv/Makefile index afe165dced2c..312093518b76 100644 --- a/www/py-python-dotenv/Makefile +++ b/www/py-python-dotenv/Makefile @@ -13,17 +13,12 @@ COMMENT= Add .env support to your django/flask apps LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR} \ + ${PY_TYPING} USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_VER} < 3.5 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> |