Index: devel/Makefile =================================================================== --- devel/Makefile +++ devel/Makefile @@ -4347,6 +4347,7 @@ SUBDIR += py-distlib SUBDIR += py-distorm SUBDIR += py-distributed + SUBDIR += py-dj31-django-rq SUBDIR += py-django-rq SUBDIR += py-docker-py SUBDIR += py-dockerpty Index: devel/py-dj31-django-rq/Makefile =================================================================== --- devel/py-dj31-django-rq/Makefile +++ devel/py-dj31-django-rq/Makefile @@ -4,7 +4,7 @@ PORTNAME= django-rq PORTVERSION= 2.3.2 CATEGORIES= devel python -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MASTER_SITES= CHEESESHOP MAINTAINER= sunpoet@FreeBSD.org @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.0:www/py-django22@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=2.0:www/py-django31@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}redis>=3:databases/py-redis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rq>=1.2:devel/py-rq@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ @@ -22,12 +22,12 @@ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ redis-server:databases/redis -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-rq +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-rq # https://github.com/rq/django-rq/blob/master/Makefile do-test: Index: devel/py-django-rq/Makefile =================================================================== --- devel/py-django-rq/Makefile +++ devel/py-django-rq/Makefile @@ -27,7 +27,7 @@ NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-rq +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-rq # https://github.com/rq/django-rq/blob/master/Makefile do-test: Index: www/Makefile =================================================================== --- www/Makefile +++ www/Makefile @@ -1441,6 +1441,20 @@ SUBDIR += py-cssmin SUBDIR += py-cssselect SUBDIR += py-cssutils + SUBDIR += py-dj31-django-auth-ldap + SUBDIR += py-dj31-django-cacheops + SUBDIR += py-dj31-django-cors-headers + SUBDIR += py-dj31-django-debug-toolbar + SUBDIR += py-dj31-django-filter + SUBDIR += py-dj31-django-js-asset + SUBDIR += py-dj31-django-mptt + SUBDIR += py-dj31-django-prometheus + SUBDIR += py-dj31-django-redis + SUBDIR += py-dj31-django-tables2 + SUBDIR += py-dj31-django-taggit + SUBDIR += py-dj31-django-timezone-field + SUBDIR += py-dj31-djangorestframework + SUBDIR += py-dj31-drf-yasg SUBDIR += py-django SUBDIR += py-django-allauth SUBDIR += py-django-annoying Index: www/py-dj31-django-auth-ldap/Makefile =================================================================== --- www/py-dj31-django-auth-ldap/Makefile +++ www/py-dj31-django-auth-ldap/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 2.2.0 CATEGORIES= www security python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= kai@FreeBSD.org COMMENT= LDAP integration for django.contrib.auth @@ -13,16 +13,15 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=1.11:www/py-django31@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ldap>=3.1:net/py-ldap@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes PORTDOCS= * -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-auth-ldap \ - ${PYTHON_PKGNAMEPREFIX}dj22-django-auth-ldap +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-auth-ldap OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PY_SPHINX} Index: www/py-dj31-django-cacheops/Makefile =================================================================== --- www/py-dj31-django-cacheops/Makefile +++ www/py-dj31-django-cacheops/Makefile @@ -4,7 +4,7 @@ PORTVERSION= 5.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= kai@FreeBSD.org COMMENT= Slick ORM cache with automatic granular event-driven invalidation @@ -12,15 +12,15 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.1:www/py-django22@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=2.1:www/py-django31@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}redis>=3.0.0:databases/py-redis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}funcy>=1.8<2.0:devel/py-funcy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-cacheops +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-cacheops NO_ARCH= yes Index: www/py-dj31-django-cors-headers/Makefile =================================================================== --- www/py-dj31-django-cors-headers/Makefile +++ www/py-dj31-django-cors-headers/Makefile @@ -4,7 +4,7 @@ PORTVERSION= 3.4.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= kai@FreeBSD.org COMMENT= Handles server headers required for Cross-Origin Resource Sharing @@ -12,12 +12,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.0:www/py-django22@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=2.0:www/py-django31@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-cors-headers +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-cors-headers .include Index: www/py-dj31-django-debug-toolbar/Makefile =================================================================== --- www/py-dj31-django-debug-toolbar/Makefile +++ www/py-dj31-django-debug-toolbar/Makefile @@ -6,7 +6,7 @@ PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= sunpoet@FreeBSD.org COMMENT= Configurable set of panels to display debug information @@ -14,14 +14,14 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=1.11:www/py-django31@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.0:databases/py-sqlparse@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-debug-toolbar +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar .include Index: www/py-dj31-django-filter/Makefile =================================================================== --- www/py-dj31-django-filter/Makefile +++ www/py-dj31-django-filter/Makefile @@ -4,7 +4,7 @@ DISTVERSION= 2.3.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= kai@FreeBSD.org COMMENT= Dynamic filtering for querysets with Django @@ -12,13 +12,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=2.2:www/py-django31@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-filter \ - ${PYTHON_PKGNAMEPREFIX}dj22-django-filter +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-filter .include Index: www/py-dj31-django-js-asset/Makefile =================================================================== --- www/py-dj31-django-js-asset/Makefile +++ www/py-dj31-django-js-asset/Makefile @@ -5,7 +5,7 @@ PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= kai@FreeBSD.org COMMENT= Insert script tags with additional attributes for django.forms.Media @@ -13,12 +13,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>0:www/py-django31@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-js-asset +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-js-asset .include Index: www/py-dj31-django-mptt/Makefile =================================================================== --- www/py-dj31-django-mptt/Makefile +++ www/py-dj31-django-mptt/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.11.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= kai@FreeBSD.org COMMENT= Utilities for implementing Modified Preorder Tree Traversal in Django @@ -13,14 +13,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR}\ - ${PYTHON_PKGNAMEPREFIX}django-js-asset>0:www/py-django-js-asset@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=1.11:www/py-django31@${PY_FLAVOR}\ + ${PYTHON_PKGNAMEPREFIX}dj31-django-js-asset>0:www/py-dj31-django-js-asset@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-happenings \ - ${PYTHON_PKGNAMEPREFIX}dj22-django-mptt + ${PYTHON_PKGNAMEPREFIX}django-mptt .include Index: www/py-dj31-django-prometheus/Makefile =================================================================== --- www/py-dj31-django-prometheus/Makefile +++ www/py-dj31-django-prometheus/Makefile @@ -4,7 +4,7 @@ PORTVERSION= 2.0.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= kai@FreeBSD.org COMMENT= Export Django monitoring metrics for Prometheus.io @@ -12,13 +12,13 @@ LICENSE= APACHE20 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=1.11:www/py-django31@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.7:net-mgmt/py-prometheus-client@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-prometheus +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-prometheus NO_ARCH= yes @@ -31,6 +31,6 @@ MEMCACHED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached@${PY_FLAVOR} MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=0:databases/py-mysqlclient@${PY_FLAVOR} PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${PY_FLAVOR} -REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-redis>=4.8:www/py-django-redis@${PY_FLAVOR} +REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dj31-django-redis>=4.8:www/py-dj31-django-redis@${PY_FLAVOR} .include Index: www/py-dj31-django-redis/Makefile =================================================================== --- www/py-dj31-django-redis/Makefile +++ www/py-dj31-django-redis/Makefile @@ -4,7 +4,7 @@ PORTVERSION= 4.12.1 CATEGORIES= www databases MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= sunpoet@FreeBSD.org COMMENT= Full featured Redis cache/session backend for Django @@ -12,14 +12,16 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=2.2:www/py-django31@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}redis>=3.0.0:databases/py-redis@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-redis NO_ARCH= yes Index: www/py-dj31-django-tables2/Makefile =================================================================== --- www/py-dj31-django-tables2/Makefile +++ www/py-dj31-django-tables2/Makefile @@ -5,7 +5,7 @@ DISTVERSION= 2.3.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= kai@FreeBSD.org COMMENT= Table/data-grid framework for Django @@ -13,10 +13,12 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=0:www/py-django22@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=0:www/py-django31@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= distutils autoplist + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-tables2 NO_ARCH= yes Index: www/py-dj31-django-taggit/Makefile =================================================================== --- www/py-dj31-django-taggit/Makefile +++ www/py-dj31-django-taggit/Makefile @@ -4,7 +4,7 @@ PORTVERSION= 1.3.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= kai@FreeBSD.org COMMENT= Reusable Django application for simple tagging @@ -12,12 +12,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=1.11:www/py-django31@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-taggit .include Index: www/py-dj31-django-timezone-field/Makefile =================================================================== --- www/py-dj31-django-timezone-field/Makefile +++ www/py-dj31-django-timezone-field/Makefile @@ -4,7 +4,7 @@ DISTVERSION= 4.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= kai@FreeBSD.org COMMENT= Provides database and form fields for pytz timezone objects for Django @@ -12,13 +12,13 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=1.11:www/py-django31@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-timezone-field +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-timezone-field .include Index: www/py-dj31-djangorestframework/Makefile =================================================================== --- www/py-dj31-djangorestframework/Makefile +++ www/py-dj31-djangorestframework/Makefile @@ -2,10 +2,9 @@ PORTNAME= djangorestframework PORTVERSION= 3.12.1 -PORTEPOCH= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= kai@FreeBSD.org COMMENT= Django REST framework @@ -13,14 +12,14 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=2.2:www/py-django31@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= distutils autoplist CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}djangorestframework3* \ - ${PYTHON_PKGNAMEPREFIX}dj22-djangorestframework + ${PYTHON_PKGNAMEPREFIX}djangorestframework NO_ARCH= yes .include Index: www/py-dj31-drf-yasg/Makefile =================================================================== --- www/py-dj31-drf-yasg/Makefile +++ www/py-dj31-drf-yasg/Makefile @@ -4,7 +4,7 @@ DISTVERSION= 1.20.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj31- MAINTAINER= kai@FreeBSD.org COMMENT= Yet Another Swagger Generator @@ -13,8 +13,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.0.6:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.2.16:www/py-django22@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.10.3:www/py-djangorestframework@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=2.2.16:www/py-django31@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj31-djangorestframework>=3.10.3:www/py-dj31-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coreapi>=2.3.3:devel/py-coreapi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coreschema>=0.0.4:devel/py-coreschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}inflection>=0.3.1:devel/py-inflection@${PY_FLAVOR} \ @@ -23,8 +23,10 @@ ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= distutils autoplist + +CONFLICTS_INSTALL= ${PYTHON_PGKNAMEPREFIX}drf-yasg NO_ARCH= yes Index: www/py-django-auth-ldap/Makefile =================================================================== --- www/py-django-auth-ldap/Makefile +++ www/py-django-auth-ldap/Makefile @@ -21,8 +21,7 @@ NO_ARCH= yes PORTDOCS= * -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-auth-ldap \ - ${PYTHON_PKGNAMEPREFIX}dj22-django-auth-ldap +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-auth-ldap OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PY_SPHINX} Index: www/py-django-cacheops/Makefile =================================================================== --- www/py-django-cacheops/Makefile +++ www/py-django-cacheops/Makefile @@ -20,7 +20,7 @@ USES= python:3.5+ USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-cacheops +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-cacheops NO_ARCH= yes Index: www/py-django-cors-headers/Makefile =================================================================== --- www/py-django-cors-headers/Makefile +++ www/py-django-cors-headers/Makefile @@ -18,6 +18,6 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-cors-headers +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-cors-headers .include Index: www/py-django-debug-toolbar/Makefile =================================================================== --- www/py-django-debug-toolbar/Makefile +++ www/py-django-debug-toolbar/Makefile @@ -21,6 +21,6 @@ NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-debug-toolbar +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-debug-toolbar .include Index: www/py-django-filter/Makefile =================================================================== --- www/py-django-filter/Makefile +++ www/py-django-filter/Makefile @@ -18,7 +18,6 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-filter \ - ${PYTHON_PKGNAMEPREFIX}dj22-django-filter +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-filter .include Index: www/py-django-js-asset/Makefile =================================================================== --- www/py-django-js-asset/Makefile +++ www/py-django-js-asset/Makefile @@ -19,6 +19,6 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-js-asset +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-js-asset .include Index: www/py-django-mptt/Makefile =================================================================== --- www/py-django-mptt/Makefile +++ www/py-django-mptt/Makefile @@ -21,6 +21,6 @@ NO_ARCH= yes CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-happenings \ - ${PYTHON_PKGNAMEPREFIX}dj22-django-mptt + ${PYTHON_PKGNAMEPREFIX}dj31-django-mptt .include Index: www/py-django-prometheus/Makefile =================================================================== --- www/py-django-prometheus/Makefile +++ www/py-django-prometheus/Makefile @@ -18,7 +18,7 @@ USES= python:3.5+ USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-prometheus +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-prometheus NO_ARCH= yes Index: www/py-django-redis/Makefile =================================================================== --- www/py-django-redis/Makefile +++ www/py-django-redis/Makefile @@ -21,6 +21,8 @@ USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-redis + NO_ARCH= yes do-test: Index: www/py-django-tables2/Makefile =================================================================== --- www/py-django-tables2/Makefile +++ www/py-django-tables2/Makefile @@ -18,6 +18,8 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-tables2 + NO_ARCH= yes OPTIONS_DEFINE= TABLIB Index: www/py-django-taggit/Makefile =================================================================== --- www/py-django-taggit/Makefile +++ www/py-django-taggit/Makefile @@ -18,6 +18,6 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-taggit .include Index: www/py-django-timezone-field/Makefile =================================================================== --- www/py-django-timezone-field/Makefile +++ www/py-django-timezone-field/Makefile @@ -19,6 +19,6 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-timezone-field +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-timezone-field .include Index: www/py-djangorestframework/Makefile =================================================================== --- www/py-djangorestframework/Makefile +++ www/py-djangorestframework/Makefile @@ -20,7 +20,7 @@ USE_PYTHON= distutils autoplist CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}djangorestframework3* \ - ${PYTHON_PKGNAMEPREFIX}dj22-djangorestframework + ${PYTHON_PKGNAMEPREFIX}dj31-djangorestframework NO_ARCH= yes .include Index: www/py-drf-yasg/Makefile =================================================================== --- www/py-drf-yasg/Makefile +++ www/py-drf-yasg/Makefile @@ -26,6 +26,8 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}py-dj31-drf-yasg + NO_ARCH= yes OPTIONS_DEFINE= VALIDATION