diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2020-07-14 07:59:28 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2020-07-14 07:59:28 +0000 |
| commit | 05e70680320d1850a5a3cf0aa800119b045a650b (patch) | |
| tree | 01020e258e5f349557804ca048766c6b130436ba | |
| parent | dd57842caf36b7383c6711594bf9defc93c0c285 (diff) | |
Notes
92 files changed, 119 insertions, 708 deletions
@@ -15152,3 +15152,6 @@ multimedia/f3d|graphics/f3d|2020-07-09|Move to a proper category textproc/py-sphinx-hieroglyph|textproc/py-hieroglyph|2020-07-11|Renamed to reflect official name at PyPI devel/py-Pint|devel/py-pint|2020-07-11|Rename to match our py- port naming audio/aucatctl|audio/sndio|2020-07-12|Use sndioctl from audio/sndio instead +devel/py-freenas.dispatcher||2020-07-14|Uses deprecated version of python +textproc/scancode-toolkit||2020-07-14|Uses deprecated version of python +www/py-kallithea||2020-07-14|Uses deprecated version of python diff --git a/audio/beets/Makefile b/audio/beets/Makefile index f6912dd03558..1505c12071e2 100644 --- a/audio/beets/Makefile +++ b/audio/beets/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}confuse>=1.0.0:devel/py-confuse@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ ${PY_ENUM34} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils optsuffix PLIST_FILES= man/man1/beet.1.gz man/man5/beetsconfig.5.gz diff --git a/biology/py-gffutils/Makefile b/biology/py-gffutils/Makefile index cd03b919a14e..5bf603f033cd 100644 --- a/biology/py-gffutils/Makefile +++ b/biology/py-gffutils/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argcomplete>=1.9.4:devel/py-argcomplete@${PY ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile index a29ddf13e86e..df4f9ef37966 100644 --- a/databases/pgbarman/Makefile +++ b/databases/pgbarman/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= rsync:net/rsync \ ${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:devel/py-argh@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${PY_FLAVOR} -USES= pgsql python +USES= pgsql python:3.6+ USE_PYTHON= autoplist distutils concurrent optsuffix WANT_PGSQL= client diff --git a/databases/py-tableschema/Makefile b/databases/py-tableschema/Makefile index 2949e2b59877..3709a2ee53e7 100644 --- a/databases/py-tableschema/Makefile +++ b/databases/py-tableschema/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cached-property>=1.5:devel/py-cached-propert ${PYTHON_PKGNAMEPREFIX}tabulator>=1.29:devel/py-tabulator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unicodecsv>=0.14:devel/py-unicodecsv@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/Makefile b/devel/Makefile index d1091960c04d..c7d5c9dd7753 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4404,7 +4404,6 @@ SUBDIR += py-foolscap SUBDIR += py-freebsd SUBDIR += py-freebsd-sysctl - SUBDIR += py-freenas.dispatcher SUBDIR += py-freenas.utils SUBDIR += py-freezegun SUBDIR += py-frozendict diff --git a/devel/py-argcomplete/Makefile b/devel/py-argcomplete/Makefile index c04b2495c192..4b7892fb7efd 100644 --- a/devel/py-argcomplete/Makefile +++ b/devel/py-argcomplete/Makefile @@ -18,7 +18,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-aws-sam-translator/Makefile b/devel/py-aws-sam-translator/Makefile index 4456a3e06444..c1719bd57a80 100644 --- a/devel/py-aws-sam-translator/Makefile +++ b/devel/py-aws-sam-translator/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>=1.5:www/py-boto3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.11:devel/py-six@${PY_FLAVOR} \ ${PY_ENUM34} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-aws-xray-sdk/Makefile b/devel/py-aws-xray-sdk/Makefile index 2eb69b7485fe..a3a212dfc6b3 100644 --- a/devel/py-aws-xray-sdk/Makefile +++ b/devel/py-aws-xray-sdk/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.11.3:devel/py-botocore@${PY_FLAV ${PYTHON_PKGNAMEPREFIX}jsonpickle>=0:devel/py-jsonpickle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wrapt>=0:devel/py-wrapt@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-cabby/Makefile b/devel/py-cabby/Makefile index 9396d5b082cf..6cc52f441697 100644 --- a/devel/py-cabby/Makefile +++ b/devel/py-cabby/Makefile @@ -12,7 +12,7 @@ COMMENT= Python TAXII client implementation from EclecticIQ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}furl>0:devel/py-furl@${PY_FLAVOR} diff --git a/devel/py-celery/Makefile b/devel/py-celery/Makefile index d7efe1417c01..7abf3f30507b 100644 --- a/devel/py-celery/Makefile +++ b/devel/py-celery/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:devel/py-billiard@${PY_FL ${PYTHON_PKGNAMEPREFIX}vine>=1.3.0:devel/py-vine@${PY_FLAVOR} NO_ARCH= yes -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils .include <bsd.port.mk> diff --git a/devel/py-cfn-lint/Makefile b/devel/py-cfn-lint/Makefile index e761af236f12..2c4947ae0a8a 100644 --- a/devel/py-cfn-lint/Makefile +++ b/devel/py-cfn-lint/Makefile @@ -18,12 +18,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0:devel/py-jsonschema@${PY_FLAVOR} -py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=1.0.2:devel/py-importlib-resources@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pathlib2>=2.3.0:devel/py-pathlib2@${PY_FLAVOR} -py35_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=1.0.2:devel/py-importlib-resources@${PY_FLAVOR} py36_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=1.0.2:devel/py-importlib-resources@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-confuse/Makefile b/devel/py-confuse/Makefile index 426afa5cd2fe..32e457193b27 100644 --- a/devel/py-confuse/Makefile +++ b/devel/py-confuse/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= distutils autoplist .include <bsd.port.mk> diff --git a/devel/py-flake8-builtins/Makefile b/devel/py-flake8-builtins/Makefile index 4ac708c07334..81f755a1ccfe 100644 --- a/devel/py-flake8-builtins/Makefile +++ b/devel/py-flake8-builtins/Makefile @@ -18,7 +18,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hypothesmith>=0:devel/py-hypothesmith@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-flake8-polyfill/Makefile b/devel/py-flake8-polyfill/Makefile index 949614789c65..9b3158278247 100644 --- a/devel/py-flake8-polyfill/Makefile +++ b/devel/py-flake8-polyfill/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-flake8-quotes/Makefile b/devel/py-flake8-quotes/Makefile index cea5a0611c5a..873fb5dc6223 100644 --- a/devel/py-flake8-quotes/Makefile +++ b/devel/py-flake8-quotes/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile index 28ac7ae70339..22174ad273b9 100644 --- a/devel/py-flake8/Makefile +++ b/devel/py-flake8/Makefile @@ -20,16 +20,12 @@ RUN_DEPENDS= ${PY_ENUM34} \ ${PYTHON_PKGNAMEPREFIX}pyflakes>=0:devel/py-pyflakes@${PY_FLAVOR} \ ${PY_TYPING} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes .include <bsd.port.pre.mk> -.if ${PYTHON_REL} < 3200 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${PY_FLAVOR} -.endif .if ${PYTHON_REL} < 3800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} .endif diff --git a/devel/py-freenas.dispatcher/Makefile b/devel/py-freenas.dispatcher/Makefile deleted file mode 100644 index a4fa19fdf75f..000000000000 --- a/devel/py-freenas.dispatcher/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $FreeBSD$ - -PORTNAME= freenas.dispatcher -PORTVERSION= 10.2a1 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= wg@FreeBSD.org -COMMENT= FreeNAS dispatcher client - -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-08-15 - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ws4py>0:www/py-ws4py@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${PY_FLAVOR} - -USES= python:2.7 -USE_PYTHON= autoplist distutils - -.include <bsd.port.mk> diff --git a/devel/py-freenas.dispatcher/distinfo b/devel/py-freenas.dispatcher/distinfo deleted file mode 100644 index 86dd8ad87dd5..000000000000 --- a/devel/py-freenas.dispatcher/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (freenas.dispatcher-10.2a1.tar.gz) = 020be1b1e6b23710fe71a4f110b024cf4205a1a63e98dab690b62eefe94ea98e -SIZE (freenas.dispatcher-10.2a1.tar.gz) = 12124 diff --git a/devel/py-freenas.dispatcher/pkg-descr b/devel/py-freenas.dispatcher/pkg-descr deleted file mode 100644 index d7a577522914..000000000000 --- a/devel/py-freenas.dispatcher/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -FreeNAS Dispatcher Client, used to access WebSocket RPC. - -WWW: https://github.com/freenas/middleware diff --git a/devel/py-furl/Makefile b/devel/py-furl/Makefile index 9f7c0a299388..d074e522405a 100644 --- a/devel/py-furl/Makefile +++ b/devel/py-furl/Makefile @@ -12,7 +12,7 @@ COMMENT= Small Python library that makes parsing and manipulating URLs easy LICENSE= PD LICENSE_FILE= ${WRKSRC}/LICENSE.md -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}orderedmultidict>0:devel/py-orderedmultidict@${PY_FLAVOR} diff --git a/devel/py-importlib-metadata/Makefile b/devel/py-importlib-metadata/Makefile index b49a9e4ca697..b3e3eabd4208 100644 --- a/devel/py-importlib-metadata/Makefile +++ b/devel/py-importlib-metadata/Makefile @@ -16,15 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zipp>=0.5:devel/py-zipp@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}contextlib2>=0:devel/py-contextlib2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-jsonform/Makefile b/devel/py-jsonform/Makefile index 51dfba0fcce7..1dd34653d101 100644 --- a/devel/py-jsonform/Makefile +++ b/devel/py-jsonform/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.4.0:devel/py-jsonschema@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_GITHUB= yes GH_ACCOUNT= RussellLuo diff --git a/devel/py-jsonpickle/Makefile b/devel/py-jsonpickle/Makefile index 46c4e6e19ea5..c0c16249fdf9 100644 --- a/devel/py-jsonpickle/Makefile +++ b/devel/py-jsonpickle/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= distutils autoplist NO_ARCH= yes diff --git a/devel/py-jsonschema/Makefile b/devel/py-jsonschema/Makefile index c3213d439c12..030c3d8ad434 100644 --- a/devel/py-jsonschema/Makefile +++ b/devel/py-jsonschema/Makefile @@ -17,9 +17,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${PY_FL RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=17.4.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyrsistent>=0.14.0:devel/py-pyrsistent@${PY_FLAVOR} -py27_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-molecule/Makefile b/devel/py-molecule/Makefile index 553742fb96cd..904ecbb77788 100644 --- a/devel/py-molecule/Makefile +++ b/devel/py-molecule/Makefile @@ -47,7 +47,7 @@ TEST_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}pytest-verbose-parametrize>=1.7.0:devel/py-pytest-verbose-parametrize@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.29.0:devel/py-pytest-xdist@${PY_FLAVOR} -USES= python:-3.7 +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes @@ -73,13 +73,7 @@ GCE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libcloud>0:net/py-libcloud@${PY_FLAVOR} # The click module demands a UTF-8 locale when used with python-3.x TEST_ENV= LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3200 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR} -.endif - do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-openapi-spec-validator/Makefile b/devel/py-openapi-spec-validator/Makefile index 5abb817a01a9..04d723354c29 100644 --- a/devel/py-openapi-spec-validator/Makefile +++ b/devel/py-openapi-spec-validator/Makefile @@ -22,15 +22,9 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0:devel/py-pytest-flake8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.messaging10/Makefile b/devel/py-oslo.messaging10/Makefile index 1812ad5be06d..b19749f09822 100644 --- a/devel/py-oslo.messaging10/Makefile +++ b/devel/py-oslo.messaging10/Makefile @@ -23,9 +23,16 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=2.5.2:net/py-amqp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.31.0:devel/py-oslo.middleware@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.24.0:devel/py-oslo.service@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.37.0:devel/py-oslo.utils@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes @@ -33,32 +40,4 @@ NO_ARCH= yes # oslo.messaging 11.0.0+ requires Python 3.6+ PORTSCOUT= limit:^10\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cachetools3>=2.0.0:devel/py-cachetools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log3>=3.36.0:devel/py-oslo.log3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.middleware3>=3.31.0:devel/py-oslo.middleware3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=2.18.0:devel/py-oslo.serialization2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.service1>=1.24.0:devel/py-oslo.service1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.37.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.31.0:devel/py-oslo.middleware@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.24.0:devel/py-oslo.service@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.37.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.versionedobjects1/Makefile b/devel/py-oslo.versionedobjects1/Makefile index 27d2402c381f..14924298e354 100644 --- a/devel/py-oslo.versionedobjects1/Makefile +++ b/devel/py-oslo.versionedobjects1/Makefile @@ -19,29 +19,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR} - -USES= python -USE_PYTHON= autoplist concurrent distutils - -NO_ARCH= yes - -# oslo.versionedobjects 2.0.0+ requires Python 3.6+ -PORTSCOUT= limit:^1\. - -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.concurrency3>=3.26.0:devel/py-oslo.concurrency3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context2>=2.19.2:devel/py-oslo.context2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log3>=3.36.0:devel/py-oslo.log3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.messaging10>=5.29.0:devel/py-oslo.messaging10@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=2.18.0:devel/py-oslo.serialization2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ @@ -49,6 +28,13 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.conc ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.29.0:devel/py-oslo.messaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif -.include <bsd.port.post.mk> +USES= python:3.6+ +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +# oslo.versionedobjects 2.0.0+ requires Python 3.6+ +PORTSCOUT= limit:^1\. + +.include <bsd.port.mk> diff --git a/devel/py-path.py/Makefile b/devel/py-path.py/Makefile index 2d4bf3113205..8c12b66fea07 100644 --- a/devel/py-path.py/Makefile +++ b/devel/py-path.py/Makefile @@ -16,7 +16,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}pytest-flake8>0:devel/py-pytest-flake8@${PY_FLAVOR} NO_ARCH= yes -USES= python +USES= python:3.6+ USE_GITHUB= yes USE_PYTHON= autoplist distutils GH_ACCOUNT= jaraco diff --git a/devel/py-pep517/Makefile b/devel/py-pep517/Makefile index 62c20c8b6918..3a7a2a46f9fc 100644 --- a/devel/py-pep517/Makefile +++ b/devel/py-pep517/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pep8-naming/Makefile b/devel/py-pep8-naming/Makefile index 6c46315311da..1944fe2e197d 100644 --- a/devel/py-pep8-naming/Makefile +++ b/devel/py-pep8-naming/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py-flake8-polyfill@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}entrypoints>=0:devel/py-entrypoints@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-pluggy/Makefile b/devel/py-pluggy/Makefile index 6c7423cc4359..8fb9d84d8aa9 100644 --- a/devel/py-pluggy/Makefile +++ b/devel/py-pluggy/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-pre-commit/Makefile b/devel/py-pre-commit/Makefile index 83ee7f04af35..0ee0e38663e5 100644 --- a/devel/py-pre-commit/Makefile +++ b/devel/py-pre-commit/Makefile @@ -25,15 +25,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aspy.yaml>=0:devel/py-aspy.yaml@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} -USES= python shebangfix +USES= python:3.6+ shebangfix USE_PYTHON= autoplist distutils SHEBANG_FILES= pre_commit/resources/hook-tmpl -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3200 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=0:devel/py-futures@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-pytest-azurepipelines/Makefile b/devel/py-pytest-azurepipelines/Makefile index 7f4346e0c9d7..4c4d5f85bc45 100644 --- a/devel/py-pytest-azurepipelines/Makefile +++ b/devel/py-pytest-azurepipelines/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5.0:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pytest-benchmark/Makefile b/devel/py-pytest-benchmark/Makefile index c75e3583b8e9..ff39ec7359e3 100644 --- a/devel/py-pytest-benchmark/Makefile +++ b/devel/py-pytest-benchmark/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py-cpuinfo>=0:sysutils/py-py-cpuinfo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=3.8:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pytest-cache/Makefile b/devel/py-pytest-cache/Makefile index 84608d723819..790a6e033ed4 100644 --- a/devel/py-pytest-cache/Makefile +++ b/devel/py-pytest-cache/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.2:devel/py-pytest@${PY_FLAVOR} \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} NO_ARCH= yes -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils DO_MAKE_TEST= ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} TEST_TARGET= test diff --git a/devel/py-pytest-cov/Makefile b/devel/py-pytest-cov/Makefile index 544b4c766e56..14fcfd9893f7 100644 --- a/devel/py-pytest-cov/Makefile +++ b/devel/py-pytest-cov/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=4.4:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=3.6:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pytest-django/Makefile b/devel/py-pytest-django/Makefile index 314e790acb62..e5c3239b49d0 100644 --- a/devel/py-pytest-django/Makefile +++ b/devel/py-pytest-django/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.11.1:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pytest-factoryboy/Makefile b/devel/py-pytest-factoryboy/Makefile index 8e280302e9d9..1ad1a9872c95 100644 --- a/devel/py-pytest-factoryboy/Makefile +++ b/devel/py-pytest-factoryboy/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}inflection>=0:devel/py-inflection@${PY_FLAVO TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}text-unidecode>=0:converters/py-text-unidecode@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_GITHUB= yes # tests not shiped with sdist GH_ACCOUNT= pytest-dev USE_PYTHON= autoplist concurrent distutils diff --git a/devel/py-pytest-fixture-config/Makefile b/devel/py-pytest-fixture-config/Makefile index 34a77b1505be..3fd69ef7eba4 100644 --- a/devel/py-pytest-fixture-config/Makefile +++ b/devel/py-pytest-fixture-config/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=0:devel/py-setuptools-git@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.0:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils diff --git a/devel/py-pytest-flake8/Makefile b/devel/py-pytest-flake8/Makefile index ae913f24b376..2c3786f69e26 100644 --- a/devel/py-pytest-flake8/Makefile +++ b/devel/py-pytest-flake8/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=3.5:devel/py-flake8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pytest-flakes/Makefile b/devel/py-pytest-flakes/Makefile index e2093c6f9fd7..7ee1396d9849 100644 --- a/devel/py-pytest-flakes/Makefile +++ b/devel/py-pytest-flakes/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= distutils autoplist NO_ARCH= yes diff --git a/devel/py-pytest-flask/Makefile b/devel/py-pytest-flask/Makefile index 627ffcfe7986..ef37aa79e3aa 100644 --- a/devel/py-pytest-flask/Makefile +++ b/devel/py-pytest-flask/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=3.6:devel/py-pytest@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils TEST_ENV= PYTHONPATH=${WRKSRC}/src diff --git a/devel/py-pytest-forked/Makefile b/devel/py-pytest-forked/Makefile index fb5350623533..f0f507afb47b 100644 --- a/devel/py-pytest-forked/Makefile +++ b/devel/py-pytest-forked/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.1.0:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pytest-isort/Makefile b/devel/py-pytest-isort/Makefile index c601579f93b9..97fbe3f88750 100644 --- a/devel/py-pytest-isort/Makefile +++ b/devel/py-pytest-isort/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isort>=4.0:devel/py-isort@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pytest-lazy-fixture/Makefile b/devel/py-pytest-lazy-fixture/Makefile index 8ef8305538ff..92e33944e381 100644 --- a/devel/py-pytest-lazy-fixture/Makefile +++ b/devel/py-pytest-lazy-fixture/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.5:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pytest-localserver/Makefile b/devel/py-pytest-localserver/Makefile index 5e02d03c5858..d6c0c56ae38a 100644 --- a/devel/py-pytest-localserver/Makefile +++ b/devel/py-pytest-localserver/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.10:www/py-werkzeug@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-pytest-mock/Makefile b/devel/py-pytest-mock/Makefile index 6304964d9db4..305376cee780 100644 --- a/devel/py-pytest-mock/Makefile +++ b/devel/py-pytest-mock/Makefile @@ -18,18 +18,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.7:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_VER} < 3.0 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} -.endif - do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs test_pytest_mock.py -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-pytest-pep8/Makefile b/devel/py-pytest-pep8/Makefile index ef55f0a6d13b..62ac10bc80d7 100644 --- a/devel/py-pytest-pep8/Makefile +++ b/devel/py-pytest-pep8/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cache>=0:devel/py-pytest-cache@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pep8>=1.3:devel/pep8@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils TEST_ENV= PYTHONPATH=${WRKSRC}/src diff --git a/devel/py-pytest-pycodestyle/Makefile b/devel/py-pytest-pycodestyle/Makefile index d9e4e27249da..8817c14f320f 100644 --- a/devel/py-pytest-pycodestyle/Makefile +++ b/devel/py-pytest-pycodestyle/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= distutils autoplist NO_ARCH= yes diff --git a/devel/py-pytest-relaxed/Makefile b/devel/py-pytest-relaxed/Makefile index c19d5ee308c9..161ba3ba6382 100644 --- a/devel/py-pytest-relaxed/Makefile +++ b/devel/py-pytest-relaxed/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3,<5:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1,<2:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>=4,<5:devel/py-decorator@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-pytest-rerunfailures/Makefile b/devel/py-pytest-rerunfailures/Makefile index 648f1c3fab53..959fd7dea5bf 100644 --- a/devel/py-pytest-rerunfailures/Makefile +++ b/devel/py-pytest-rerunfailures/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.8:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pytest-shutil/Makefile b/devel/py-pytest-shutil/Makefile index f197a0b19ffe..5dcaa776dea3 100644 --- a/devel/py-pytest-shutil/Makefile +++ b/devel/py-pytest-shutil/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAV ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils diff --git a/devel/py-pytest-sugar/Makefile b/devel/py-pytest-sugar/Makefile index 86e7695fcdf4..cea26cd2c023 100644 --- a/devel/py-pytest-sugar/Makefile +++ b/devel/py-pytest-sugar/Makefile @@ -20,6 +20,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=14.1:devel/py-packaging@${PY_FLAV NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils -USES= python +USES= python:3.6+ .include <bsd.port.mk> diff --git a/devel/py-pytest-timeout/Makefile b/devel/py-pytest-timeout/Makefile index 797866a581c9..fc0979c0c0d4 100644 --- a/devel/py-pytest-timeout/Makefile +++ b/devel/py-pytest-timeout/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.0:devel/py-pytest@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-pytest-tornado/Makefile b/devel/py-pytest-tornado/Makefile index dd64f872022a..d089a69e787b 100644 --- a/devel/py-pytest-tornado/Makefile +++ b/devel/py-pytest-tornado/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.6:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado>=4.1:www/py-tornado@${PY_FLAVOR} NO_ARCH= yes -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils .include <bsd.port.mk> diff --git a/devel/py-pytest-verbose-parametrize/Makefile b/devel/py-pytest-verbose-parametrize/Makefile index c2384ba28e18..8f5f4274b56d 100644 --- a/devel/py-pytest-verbose-parametrize/Makefile +++ b/devel/py-pytest-verbose-parametrize/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=0:devel/py-setuptools-git@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.0:devel/py-pytest@${PY_FLAVOR} -USES= python:-3.7 +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pytest-virtualenv/Makefile b/devel/py-pytest-virtualenv/Makefile index 9a3dea45ec97..76c658cbfe18 100644 --- a/devel/py-pytest-virtualenv/Makefile +++ b/devel/py-pytest-virtualenv/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-fixture-config>0:devel/py-pytest-fixt ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils diff --git a/devel/py-pytest-xdist/Makefile b/devel/py-pytest-xdist/Makefile index 37ae924abe1b..d10610abf3ca 100644 --- a/devel/py-pytest-xdist/Makefile +++ b/devel/py-pytest-xdist/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet@${PY_FLAVOR ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filelock>=0:sysutils/py-filelock@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils TEST_ENV= PYTHONPATH=${WRKSRC}/src diff --git a/devel/py-pytest-xprocess/Makefile b/devel/py-pytest-xprocess/Makefile index 54e7eef738b1..976f8a721196 100644 --- a/devel/py-pytest-xprocess/Makefile +++ b/devel/py-pytest-xprocess/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.3.5:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cache>0:devel/py-pytest-cache@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile index ccc60f62baa0..5b390f070a1b 100644 --- a/devel/py-pytest/Makefile +++ b/devel/py-pytest/Makefile @@ -18,40 +18,23 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.0:devel/py-atomicwrites@${PY ${PYTHON_PKGNAMEPREFIX}pluggy>=0.9,<1.0:devel/py-pluggy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}py>=1.5.0:devel/py-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}more-itertools>=4.0.0:devel/py-more-itertools@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.56:devel/py-hypothesis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} - -.include <bsd.port.pre.mk> - -.if ${PYTHON_VER} > 2.7 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools>=4.0.0:devel/py-more-itertools@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools5>=4.0.0,<6.0.0:devel/py-more-itertools5@${PY_FLAVOR} -.endif - -.if ${PYTHON_VER} < 3.0 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs@${PY_FLAVOR} -.endif - -.if ${PYTHON_VER} < 3.6 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=2.2.0:devel/py-pathlib2@${PY_FLAVOR} -.endif - # test_cache_failure_warns fails # https://github.com/pytest-dev/pytest/issues/1845 do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -k 'not test_cache_failure_warns') -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-pyupgrade/Makefile b/devel/py-pyupgrade/Makefile index 9f2202621411..05fbcd525ead 100644 --- a/devel/py-pyupgrade/Makefile +++ b/devel/py-pyupgrade/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tokenize-rt>=3.2.0:devel/py-tokenize-rt@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils .include <bsd.port.mk> diff --git a/devel/py-resource/Makefile b/devel/py-resource/Makefile index 15b0aa2734c8..4983fa2a173d 100644 --- a/devel/py-resource/Makefile +++ b/devel/py-resource/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonform>=0.0.2:devel/py-jsonform@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}jsonsir>=0.0.2:devel/py-jsonsir@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-easyconfig>=0.1.0:devel/py-python-easyconfig@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils .include <bsd.port.mk> diff --git a/devel/py-swagger-spec-validator/Makefile b/devel/py-swagger-spec-validator/Makefile index 44e896710157..a45b216d7a04 100644 --- a/devel/py-swagger-spec-validator/Makefile +++ b/devel/py-swagger-spec-validator/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_GITHUB= yes GH_ACCOUNT= Yelp GH_PROJECT= swagger_spec_validator diff --git a/devel/py-taskflow3/Makefile b/devel/py-taskflow3/Makefile index 7bca84dedb05..b8425ea37843 100644 --- a/devel/py-taskflow3/Makefile +++ b/devel/py-taskflow3/Makefile @@ -24,9 +24,15 @@ RUN_DEPENDS= ${PY_ENUM34} \ ${PYTHON_PKGNAMEPREFIX}pydot>=1.2.4:graphics/py-pydot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tenacity>=4.4.0:devel/py-tenacity@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}tenacity>=4.4.0:devel/py-tenacity@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}networkx>=2.1.0,1:math/py-networkx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}automaton>=1.9.0:devel/py-automaton@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}futurist>=1.2.0:devel/py-futurist@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes @@ -34,33 +40,4 @@ NO_ARCH= yes # taskflow 4.0.0+ requires Python 3.6+ PORTSCOUT= limit:^3\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}networkx>=2.1.0,1<2.3,1:math/py-networkx@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} >= 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}networkx>=2.1.0,1:math/py-networkx@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cachetools3>=2.0.0:devel/py-cachetools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}automaton1>=1.9.0:devel/py-automaton1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}futurist1>=1.2.0:devel/py-futurist1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=2.18.0:devel/py-oslo.serialization2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}automaton>=1.9.0:devel/py-automaton@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}futurist>=1.2.0:devel/py-futurist@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-testinfra/Makefile b/devel/py-testinfra/Makefile index ebd37a81b623..283659427156 100644 --- a/devel/py-testinfra/Makefile +++ b/devel/py-testinfra/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@$ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>1.4:devel/py-six@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= distutils autoplist .include <bsd.port.mk> diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile index 6f99d0b7dd79..b2985d799245 100644 --- a/devel/py-tox/Makefile +++ b/devel/py-tox/Makefile @@ -25,7 +25,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0,<5:devel/py-pytest@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.22.2,<2:devel/py-pytest-xdist@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}freezegun>=0.3.11,<1:devel/py-freezegun@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-warlock/Makefile b/devel/py-warlock/Makefile index b0f685009fd2..0a22ffa8c192 100644 --- a/devel/py-warlock/Makefile +++ b/devel/py-warlock/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=0.7<4:devel/py-jsonschema@${PY_F ${PYTHON_PKGNAMEPREFIX}jsonpatch>=0.10<2:devel/py-jsonpatch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/misc/py-cinder/Makefile b/misc/py-cinder/Makefile index e4031ae2c965..fbae68c084d5 100644 --- a/misc/py-cinder/Makefile +++ b/misc/py-cinder/Makefile @@ -52,7 +52,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PY_IPADDRESS} \ ${PY_ENUM34} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile index 17f79be16fdd..e4b113da02e1 100644 --- a/net/py-kombu/Makefile +++ b/net/py-kombu/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=2.5.2<2.6:net/py-amqp@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/net/py-python-glanceclient2/Makefile b/net/py-python-glanceclient2/Makefile index 6372eaf21bac..d89df5073310 100644 --- a/net/py-python-glanceclient2/Makefile +++ b/net/py-python-glanceclient2/Makefile @@ -21,9 +21,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}warlock>=1.2.0<2:devel/py-warlock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}wrapt>=1.7.0:devel/py-wrapt@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}wrapt>=1.7.0:devel/py-wrapt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.6.2:devel/py-keystoneauth1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes @@ -31,19 +34,7 @@ NO_ARCH= yes # python-glanceclient 3.0.0+ requires Python 3.6+ PORTSCOUT= limit:^2\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth13>=3.6.2:devel/py-keystoneauth13@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.6.2:devel/py-keystoneauth1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - post-patch: @${REINPLACE_CMD} -e 's|/etc/glance|${PREFIX}&|g' ${WRKSRC}/glanceclient/shell.py -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/science/py-kliff/Makefile b/science/py-kliff/Makefile index 9a2a18fb1b89..1169940f7fb2 100644 --- a/science/py-kliff/Makefile +++ b/science/py-kliff/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} -USES= compiler:c++11-lang python +USES= compiler:c++11-lang python:3.6+ USE_PYTHON= distutils autoplist post-install: diff --git a/security/py-certbot-dns-digitalocean/Makefile b/security/py-certbot-dns-digitalocean/Makefile index 65f88f37af84..6062ad4457f4 100644 --- a/security/py-certbot-dns-digitalocean/Makefile +++ b/security/py-certbot-dns-digitalocean/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${P ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/security/py-muacrypt/Makefile b/security/py-muacrypt/Makefile index a55f2581f4ae..0132f2256f55 100644 --- a/security/py-muacrypt/Makefile +++ b/security/py-muacrypt/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= gpg2:security/gnupg \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/security/py-signedjson/Makefile b/security/py-signedjson/Makefile index 285afd149b0f..0d52ba1e5768 100644 --- a/security/py-signedjson/Makefile +++ b/security/py-signedjson/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson@ ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:devel/py-unpaddedbase64@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/sysutils/docker-compose/Makefile b/sysutils/docker-compose/Makefile index 6fa7dc33e82f..61ebd302beed 100644 --- a/sysutils/docker-compose/Makefile +++ b/sysutils/docker-compose/Makefile @@ -27,17 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-prope ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} NO_ARCH= yes -USES= python +USES= python:3.6+ USE_PYTHON= distutils autoplist concurrent optsuffix -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3200 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/py-focker/Makefile b/sysutils/py-focker/Makefile index 00e1e12705a6..61da08ab9696 100644 --- a/sysutils/py-focker/Makefile +++ b/sysutils/py-focker/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_GITHUB= yes # tests and LICENSE_FILE not packaged in sdist USE_PYTHON= autoplist concurrent distutils diff --git a/textproc/Makefile b/textproc/Makefile index 0e93e6b572cf..8c32cccc84cc 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1680,7 +1680,6 @@ SUBDIR += saxon-devel SUBDIR += saxon-he SUBDIR += sc-aspell - SUBDIR += scancode-toolkit SUBDIR += scdoc SUBDIR += scew SUBDIR += scim diff --git a/textproc/scancode-toolkit/Makefile b/textproc/scancode-toolkit/Makefile deleted file mode 100644 index c3124c8d6507..000000000000 --- a/textproc/scancode-toolkit/Makefile +++ /dev/null @@ -1,153 +0,0 @@ -# $FreeBSD$ - -PORTNAME= scancode-toolkit -DISTVERSIONPREFIX= v -DISTVERSION= 3.0.2 -PORTREVISION= 4 -CATEGORIES= textproc python - -MAINTAINER= kai@FreeBSD.org -COMMENT= Scans code for license, copyright, package and documented dependencies - -LICENSE= APACHE20 CC0-1.0 -LICENSE_COMB= multi -LICENSE_FILE_APACHE20= ${WRKSRC}/apache-2.0.LICENSE -LICENSE_FILE_CC0-1.0= ${WRKSRC}/cc0-1.0.LICENSE - -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nltk>=3.2:textproc/py-nltk@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}url>=0.1.4:www/py-url@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fingerprints>=0.5.4:textproc/py-fingerprints@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}patch>=1.15:devel/py-patch@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}bz2file>=0.98:archivers/py-bz2file@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}backports.os=0.1.1:devel/py-backports.os@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}text-unidecode>=1.0:converters/py-text-unidecode@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}bitarray>=0.8.1:devel/py-bitarray@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}intbitset>=2.3.0:devel/py-intbitset@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}boolean.py>=3.5:devel/py-boolean.py@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}license-expression>=0.99:textproc/py-license-expression@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyahocorasick>=1.1:textproc/py-pyahocorasick@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}saneyaml>=0:devel/py-saneyaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml>=4.0.0:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0.0:www/py-beautifulsoup@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pdfminer.six>=20170720:textproc/py-pdfminer.six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.4:security/py-pycryptodome@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}binaryornot>=0.4.0:devel/py-binaryornot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.0:textproc/py-chardet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pefile>=2018.8.8:devel/py-pefile@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pymaven-patch>=0.2.4:devel/py-pymaven-patch@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}packageurl-python>=0.7.0:textproc/py-packageurl-python@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.11.0:devel/py-xmltodict@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}javaproperties>=0.5:devel/py-javaproperties@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}click6>=6.0.0:devel/py-click6@${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} \ - ${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} \ - ${PYTHON_PKGNAMEPREFIX}spdx-tools>=0.5.4:misc/py-spdx-tools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}unicodecsv>=0:devel/py-unicodecsv@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yg.lockfile>=2.0.1:devel/py-yg.lockfile@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zclockfile>=1.0.0:devel/py-zclockfile@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}contextlib2>=0:devel/py-contextlib2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tempora1>=0:devel/py-tempora1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jaraco.timing>=0:devel/py-jaraco.timing@${PY_FLAVOR} \ - ${PY_IPADDRESS} \ - ${LOCALBASE}/bin/7z:archivers/p7zip \ - ${LOCALBASE}/bin/file:sysutils/file \ - ${LOCALBASE}/lib/libarchive.so:archivers/libarchive - -USES= python:2.7 -USE_PYTHON= distutils autoplist noflavors -USE_GITHUB= yes -GH_ACCOUNT= nexB - -NO_ARCH= yes - -# The upstream package comes with several Python packages of libmagic, p7zip -# and zlib that include precompiled binaries for different architectures: -# -# - plugins/extractcode-7z-ARCH -# bin/ -# - plugins/extractcode-libarchive-ARCH -# lib/ -# - plugins/typecode-libmagic-ARCH -# /data -# /lib -# -# We use as ARCH the "manylinux_1_x86_64" architecture to get the directory -# structure. The binary files will be overwritten in the post-install target -# when the relative symlinks are created. -BOGUSLNKS= ${LOCALBASE}/bin/7z \ - ${LOCALBASE}/libexec/p7zip/7z.so \ - ${LOCALBASE}/lib/libarchive.so \ - ${LOCALBASE}/lib/libmagic.so \ - ${LOCALBASE}/share/file/magic.mgc - -.for _b in ${BOGUSLNKS} -BOGUSDIR_${_b}= `${DIRNAME} ${_b}` -.endfor - -post-patch: - @${FIND} ${WRKSRC} -name "*.orig" -or -name "*.bak" -delete - -do-build: - # Build the port and the plugin packages - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) - @(cd ${BUILD_WRKSRC}/plugins/extractcode-7z-manylinux1_x86_64; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) - @(cd ${BUILD_WRKSRC}/plugins/extractcode-libarchive-manylinux1_x86_64; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) - @(cd ${BUILD_WRKSRC}/plugins/typecode-libmagic-manylinux1_x86_64; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) - -do-install: - # Install scancode and the plugin packages. After each installation run - # the newly created ${_PYTHONPKGLIST} is renamed for later processing. - (cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) - @${MV} ${_PYTHONPKGLIST} ${_PYTHONPKGLIST}.scancode - (cd ${INSTALL_WRKSRC}/plugins/extractcode-7z-manylinux1_x86_64; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) - @${MV} ${_PYTHONPKGLIST} ${_PYTHONPKGLIST}.extractcode-7z - (cd ${INSTALL_WRKSRC}/plugins/extractcode-libarchive-manylinux1_x86_64; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) - @${MV} ${_PYTHONPKGLIST} ${_PYTHONPKGLIST}.extractcode-libarchive - (cd ${INSTALL_WRKSRC}/plugins/typecode-libmagic-manylinux1_x86_64; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) - @${MV} ${_PYTHONPKGLIST} ${_PYTHONPKGLIST}.typecode-libmagic - # Merge the package lists from the previous install steps into one - # ${_PYTHONPKGLIST} - @${CAT} ${_PYTHONPKGLIST}.scancode ${_PYTHONPKGLIST}.extractcode-7z ${_PYTHONPKGLIST}.extractcode-libarchive ${_PYTHONPKGLIST}.typecode-libmagic > ${_PYTHONPKGLIST} - -post-install: - # Create bogus directories and files that will be used as sources for - # the relative symlinks in the stagedir. Also keep track of the - # files/directory that need to be created for later removal. -.for _f in ${BOGUSLNKS} - @if ! ${TEST} -d ${STAGEDIR}${BOGUSDIR_${_f}}; then \ - ${MKDIR} ${STAGEDIR}${BOGUSDIR_${_f}} && \ - ${ECHO} ${STAGEDIR}${BOGUSDIR_${_f}} >> ${WRKDIR}/.bogusdirs ; \ - fi - - @${ECHO} DUMMY > ${STAGEDIR}${_f} - @${ECHO} ${STAGEDIR}${_f} >> ${WRKDIR}/.bogusdirs -.endfor - - # Create the relative symlinks using the bogus libmagic, p7zip and zlib - # as sources to overwrite the placeholder that were created with the - # post-extract target. - @${RLN} ${STAGEDIR}${LOCALBASE}/bin/7z ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/extractcode_7z/bin/ - @${RLN} ${STAGEDIR}${LOCALBASE}/libexec/p7zip/7z.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/extractcode_7z/bin/ - @${RLN} ${STAGEDIR}${LOCALBASE}/lib/libarchive.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/extractcode_libarchive/lib/ - @${RLN} ${STAGEDIR}${LOCALBASE}/share/file/magic.mgc ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/typecode_libmagic/data/ - @${RLN} ${STAGEDIR}${LOCALBASE}/lib/libmagic.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/typecode_libmagic/lib/ - - # Remove all bogus source files/directories to pass stage qa - @${RM} -r `${CAT} ${WRKDIR}/.bogusdirs` - -.include <bsd.port.mk> diff --git a/textproc/scancode-toolkit/distinfo b/textproc/scancode-toolkit/distinfo deleted file mode 100644 index b7ba05839045..000000000000 --- a/textproc/scancode-toolkit/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1550756233 -SHA256 (nexB-scancode-toolkit-v3.0.2_GH0.tar.gz) = 2c11bc028e0ad47d9e72d70f5985a58a3c8b02c81805f6518fb4249818ed6648 -SIZE (nexB-scancode-toolkit-v3.0.2_GH0.tar.gz) = 137311091 diff --git a/textproc/scancode-toolkit/files/patch-setup.py b/textproc/scancode-toolkit/files/patch-setup.py deleted file mode 100644 index 77514c04accc..000000000000 --- a/textproc/scancode-toolkit/files/patch-setup.py +++ /dev/null @@ -1,63 +0,0 @@ ---- setup.py.orig 2019-02-15 14:34:52 UTC -+++ setup.py -@@ -125,25 +125,21 @@ setup( - # cluecode - # Some nltk version ranges are buggy - 'nltk >= 3.2, < 4.0', -- 'publicsuffix2', -- 'py2-ipaddress >= 2.0, <3.5', -- 'url >= 0.1.4, < 0.1.6', -- 'fingerprints == 0.5.4', -+ 'url >= 0.1.4', -+ 'fingerprints >= 0.5.4', - - # extractcode - 'patch >= 1.15, < 1.20 ', - # to work around bug http://bugs.python.org/issue19839 - # on multistream bzip2 files: this can removed in Python 3. - 'bz2file >= 0.98', -- 'extractcode-libarchive', -- 'extractcode-7z', - - # commoncode - 'backports.os == 0.1.1', -- 'future == 0.16.0', -+ 'future >= 0.16.0', - 'text-unidecode >= 1.0, < 2.0', - # required by saneyaml -- 'PyYAML >= 3.11, <=3.13', -+ 'PyYAML >= 3.11', - 'saneyaml', - - # licensedcode -@@ -151,7 +147,7 @@ setup( - 'intbitset >= 2.3.0, < 3.0', - 'boolean.py >= 3.5, < 4.0', - 'license_expression >= 0.99, < 1.0', -- 'pyahocorasick >= 1.1, < 1.2', -+ 'pyahocorasick >= 1.1', - - # multiple - 'lxml >= 4.0.0, < 5.0.0', -@@ -167,8 +163,7 @@ setup( - 'binaryornot >= 0.4.0', - 'chardet >= 3.0.0, <4.0.0', - # note that we use a short version range because we use a simpler lexer list -- 'pygments >= 2.2.0, <2.3', -- 'typecode-libmagic', -+ 'pygments >= 2.2.0', - - # packagedcode - 'pefile >= 2018.8.8', -@@ -182,9 +177,8 @@ setup( - 'click >= 6.0.0, < 7.0.0', - 'colorama >= 0.3.9', - 'pluggy >= 0.4.0, < 1.0', -- 'attrs >=17.4, < 19.0', -- 'cattrs', -- 'typing >=3.6, < 3.7', -+ 'attrs >=17.4', -+ 'typing >=3.6', - - # scancode outputs - 'jinja2 >= 2.7.0, < 3.0.0', diff --git a/textproc/scancode-toolkit/files/patch-src_commoncode_system.py b/textproc/scancode-toolkit/files/patch-src_commoncode_system.py deleted file mode 100644 index 2a9c40329e21..000000000000 --- a/textproc/scancode-toolkit/files/patch-src_commoncode_system.py +++ /dev/null @@ -1,30 +0,0 @@ ---- src/commoncode/system.py.orig 2018-05-08 13:54:52 UTC -+++ src/commoncode/system.py -@@ -46,6 +46,8 @@ def os_arch(): - os = 'win' - elif 'darwin' in sys_platform: - os = 'mac' -+ elif 'freebsd' in sys_platform: -+ os = 'freebsd' - else: - raise Exception('Unsupported OS/platform %r' % sys_platform) - return os, arch -@@ -84,7 +86,8 @@ current_os, current_arch = os_arch() - on_windows = current_os == 'win' - on_mac = current_os == 'mac' - on_linux = current_os == 'linux' --on_posix = not on_windows and (on_mac or on_linux) -+on_freebsd = current_os == 'freebsd' -+on_posix = not on_windows and (on_mac or on_linux or on_freebsd) - - current_os_arch = '%(current_os)s-%(current_arch)s' % locals() - noarch = 'noarch' -@@ -97,7 +100,7 @@ if on_windows: - lib_ext = '.dll' - if on_mac: - lib_ext = '.dylib' --if on_linux: -+if on_linux or on_freebsd: - lib_ext = '.so' - - # diff --git a/textproc/scancode-toolkit/pkg-descr b/textproc/scancode-toolkit/pkg-descr deleted file mode 100644 index ef382a218d92..000000000000 --- a/textproc/scancode-toolkit/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -ScanCode scans code and detects licenses, copyrights, package manifests, -dependencies and more. It can be also used to discover and inventory open source -and third-party packages used in your code. - -WWW: https://github.com/nexB/scancode-toolkit diff --git a/www/Makefile b/www/Makefile index 2068561252c8..7865c21020b0 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1644,7 +1644,6 @@ SUBDIR += py-jonpy SUBDIR += py-jsonfield SUBDIR += py-jsonfield2 - SUBDIR += py-kallithea SUBDIR += py-lektor SUBDIR += py-lesscpy SUBDIR += py-libsass diff --git a/www/py-flask-restx/Makefile b/www/py-flask-restx/Makefile index 5d7fc388605b..6fabc16ca704 100644 --- a/www/py-flask-restx/Makefile +++ b/www/py-flask-restx/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aniso8601>=0.82:devel/py-aniso8601@${PY_FLAV ${PY_ENUM34} NO_ARCH= yes -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils .include <bsd.port.mk> diff --git a/www/py-kallithea/Makefile b/www/py-kallithea/Makefile deleted file mode 100644 index bad6798ddfb7..000000000000 --- a/www/py-kallithea/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# Created by: Ilia Skalozubov <freebsd@skinc.ru> -# $FreeBSD$ - -PORTNAME= kallithea -PORTVERSION= 0.4.0 -CATEGORIES= www devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= Kallithea-${PORTVERSION} - -MAINTAINER= freebsd@skinc.ru -COMMENT= Fast and powerful management tool for Mercurial and Git - -LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-08-15 - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}waitress>=0.8.8:www/py-waitress@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}WebTest>=1.4.3:www/py-WebTest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}beaker>=1.6.4:www/py-beaker@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.10:databases/py-sqlalchemy10@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mako>=0.9.0:textproc/py-mako@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}celery>=2.2.5:devel/py-celery@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}urlobject>=2.3.4:www/py-urlobject@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}routes>=1.13:www/py-routes@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dulwich>=0.9.9:devel/dulwich@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.3.0:security/py-bcrypt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}bleach>=2.1.3:www/py-bleach@${PY_FLAVOR} \ - mercurial>=2.9:devel/mercurial - -USES= python:2.7 shebangfix -USE_PYTHON= distutils autoplist - -SHEBANG_FILES= kallithea/tests/scripts/manual_test_crawler.py - -NO_ARCH= yes - -USE_RC_SUBR= kallithea -SUB_FILES= pkg-message - -OPTIONS_DEFINE= GIT LDAP -GIT_DESC= Git repositories support - -GIT_RUN_DEPENDS= git:devel/git -LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap:net/py-ldap@${PY_FLAVOR} - -.include <bsd.port.mk> diff --git a/www/py-kallithea/distinfo b/www/py-kallithea/distinfo deleted file mode 100644 index ac309e2fe254..000000000000 --- a/www/py-kallithea/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1557698637 -SHA256 (Kallithea-0.4.0.tar.gz) = cb5bceffe128179d5ae6bec5d94350eafaaa5136f195ab45a47546cc2c336fdf -SIZE (Kallithea-0.4.0.tar.gz) = 4899909 diff --git a/www/py-kallithea/files/kallithea.in b/www/py-kallithea/files/kallithea.in deleted file mode 100644 index 8e354794b244..000000000000 --- a/www/py-kallithea/files/kallithea.in +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: kallithea -# REQUIRE: NETWORKING FILESYSTEMS mountlate -# KEYWORD: shutdown - -. /etc/rc.subr - -name=kallithea -rcvar=kallithea_enable -desc="Fast and powerful management tool for Mercurial and Git" - -load_rc_config ${name} - -: ${kallithea_enable:=NO} -: ${kallithea_config=%%PREFIX%%/etc/kallithea.ini} -: ${kallithea_user:=www} -: ${kallithea_group:=www} -: ${kallithea_logfile=/var/log/kallithea/kallithea.log} -: ${kallithea_pidfile=/var/run/kallithea/kallithea.pid} - -rcvars="kallithea_config kallithea_user kallithea_group kallithea_logfile kallithea_pidfile" -kallithea_enable_desc="Set to YES to enable kallithea" -kallithea_enable_defval=NO -kallithea_config_desc="Kallithea config file for paster" -kallithea_config_defval=%%PREFIX%%/etc/kallithea.ini -kallithea_user_desc="Set the user for paster" -kallithea_user_defval=www -kallithea_group_desc="Set the group for paster" -kallithea_group_defval=www -kallithea_logfile_desc="Save output to the given log file (redirects stdout)" -kallithea_logfile_defval=/var/log/kallithea/kallithea.log -kallithea_pidfile_desc="Save PID to file" -kallithea_pidfile_defval=/var/run/kallithea/kallithea.pid - -command=%%PREFIX%%/bin/paster -pidfile="${kallithea_pidfile}" -required_files="${kallithea_config}" - -command_args=" serve --pid-file=${pidfile} --log-file=${kallithea_logfile} --daemon ${kallithea_config}" - -start_precmd=kallithea_prestart -status_cmd=kallithea_status -stop_cmd=kallithea_stop - -kallithea_prestart() -{ - for _file in "${kallithea_logfile}" "${pidfile}"; do - _dir="${_file%/*}" - if [ ! -e "$_dir" ]; then - install -d -o ${kallithea_user} "${_dir}" - elif [ -f "$_dir" ]; then - echo "Not a directory: $_dir" - return 20 - fi - done -} - -kallithea_status() -{ - ${command} serve --pid-file=${pidfile} --status ${kallithea_config} - return $? -} - -kallithea_stop() -{ - echo "Stopping ${name}." - ${command} serve --pid-file=${pidfile} --stop-daemon - return $? -} - -run_rc_command "$1" diff --git a/www/py-kallithea/files/pkg-message.in b/www/py-kallithea/files/pkg-message.in deleted file mode 100644 index 8ecdc2c0015e..000000000000 --- a/www/py-kallithea/files/pkg-message.in +++ /dev/null @@ -1,14 +0,0 @@ -[ -{ type: install - message: <<EOM -For migration from RhodeCode please read: -http://kallithea.readthedocs.io/en/latest/readme.html#converting-from-rhodecode - -To create a Kallithea configuration file run the following commands: -%%PREFIX%%/bin/paster make-config Kallithea %%PREFIX%%/etc/kallithea.ini - -Current instructions for setup: -http://kallithea.readthedocs.io/en/latest/setup.html -EOM -} -] diff --git a/www/py-kallithea/pkg-descr b/www/py-kallithea/pkg-descr deleted file mode 100644 index dc4ec99be6ff..000000000000 --- a/www/py-kallithea/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -Kallithea is a fast and powerful management tool for Mercurial and Git with a -built-in push/pull server, full text search and code-review. It works on -http/https and has a built in permission/authentication system with the ability -to authenticate via LDAP or ActiveDirectory. Kallithea also provides simple API -so it's easy to integrate with existing external systems. - -Kallithea is similar in some respects to GitHub or Bitbucket, however Kallithea -can be run as standalone hosted application on your own server. It is -open-source donationware and focuses more on providing a customised, -self-administered interface for Mercurial and Git repositories. Kallithea works -on Unix-like systems and Windows, and is powered by the vcs library created by -Lukasz Balcerzak and Marcin Kuzminski to uniformly handle multiple version -control systems. - -Kallithea was forked from RhodeCode in July 2014 and has been heavily modified. - -WWW: http://kallithea-scm.org/ diff --git a/www/py-python-digitalocean/Makefile b/www/py-python-digitalocean/Makefile index 1424ce1acc68..7b6f2bfb425f 100644 --- a/www/py-python-digitalocean/Makefile +++ b/www/py-python-digitalocean/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonpickle>0:devel/py-jsonpickle@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= distutils autoplist USE_LOCALE= en_US.UTF-8 |