Date: Tue, 10 Nov 2020 08:47:04 +0000 (UTC) From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554817 - in head: devel devel/py-dj31-django-rq devel/py-django-rq www www/py-dj31-django-auth-ldap www/py-dj31-django-cacheops www/py-dj31-django-cors-headers www/py-dj31-django-debug... Message-ID: <202011100847.0AA8l4ak070642@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kai Date: Tue Nov 10 08:47:03 2020 New Revision: 554817 URL: https://svnweb.freebsd.org/changeset/ports/554817 Log: Create some ports that are assigned to Django 3.1 instead Django 2.2 * Django 2.2 is currently the "default" version in the ports tree due its long term support until April 2022. Thus ports that are assigned to that version will exist until then. The following ports are required to make the upgrade of net-mgmt/netbox to the 2.9 release possible because it requires Django 3.1 and provides no backwards compatibility for previous versions of Django. - www/py-dj31-django-rq (copied from r539662 to use the 2.3.2 release for now) - www/py-dj31-django-auth-ldap - www/py-dj31-django-cacheops - www/py-dj31-django-cors-headers - www/py-dj31-django-debug-toolbar - www/py-dj21-django-filter - www/py-dj31-django-js-asset - www/py-dj31-django-mptt - www/py-dj31-django-prometheus - www/py-dj31-django-redis - www/py-dj31-django-tables2 - www/py-dj31-django-taggit - www/py-dj31-django-timezone-field - www/py-dj31-djangorestframework - www/py-dj31-drf-yasg * Also limit the new ports to Python 3.6+ due the requirements of Django 3.1 and add/update the related CONFLICTS_INSTALL entries. Reviewed by: sunpoet Differential Revision: https://reviews.freebsd.org/D27083 Added: head/devel/py-dj31-django-rq/ - copied from r539662, head/devel/py-django-rq/ head/www/py-dj31-django-auth-ldap/ - copied from r554810, head/www/py-django-auth-ldap/ head/www/py-dj31-django-cacheops/ - copied from r554810, head/www/py-django-cacheops/ head/www/py-dj31-django-cors-headers/ - copied from r554810, head/www/py-django-cors-headers/ head/www/py-dj31-django-debug-toolbar/ - copied from r554810, head/www/py-django-debug-toolbar/ head/www/py-dj31-django-filter/ - copied from r554810, head/www/py-django-filter/ head/www/py-dj31-django-js-asset/ - copied from r554810, head/www/py-django-js-asset/ head/www/py-dj31-django-mptt/ - copied from r554810, head/www/py-django-mptt/ head/www/py-dj31-django-prometheus/ - copied from r554810, head/www/py-django-prometheus/ head/www/py-dj31-django-redis/ - copied from r554810, head/www/py-django-redis/ head/www/py-dj31-django-tables2/ - copied from r554810, head/www/py-django-tables2/ head/www/py-dj31-django-taggit/ - copied from r554810, head/www/py-django-taggit/ head/www/py-dj31-django-timezone-field/ - copied from r554810, head/www/py-django-timezone-field/ head/www/py-dj31-djangorestframework/ - copied from r554810, head/www/py-djangorestframework/ head/www/py-dj31-drf-yasg/ - copied from r554810, head/www/py-drf-yasg/ Modified: head/devel/Makefile head/devel/py-dj31-django-rq/Makefile head/devel/py-django-rq/Makefile head/www/Makefile head/www/py-dj31-django-auth-ldap/Makefile head/www/py-dj31-django-cacheops/Makefile head/www/py-dj31-django-cors-headers/Makefile head/www/py-dj31-django-debug-toolbar/Makefile head/www/py-dj31-django-filter/Makefile head/www/py-dj31-django-js-asset/Makefile head/www/py-dj31-django-mptt/Makefile head/www/py-dj31-django-prometheus/Makefile head/www/py-dj31-django-redis/Makefile head/www/py-dj31-django-tables2/Makefile head/www/py-dj31-django-taggit/Makefile head/www/py-dj31-django-timezone-field/Makefile head/www/py-dj31-djangorestframework/Makefile head/www/py-dj31-drf-yasg/Makefile head/www/py-django-auth-ldap/Makefile head/www/py-django-cacheops/Makefile head/www/py-django-cors-headers/Makefile head/www/py-django-debug-toolbar/Makefile head/www/py-django-filter/Makefile head/www/py-django-js-asset/Makefile head/www/py-django-mptt/Makefile head/www/py-django-prometheus/Makefile head/www/py-django-redis/Makefile head/www/py-django-tables2/Makefile head/www/py-django-taggit/Makefile head/www/py-django-timezone-field/Makefile head/www/py-djangorestframework/Makefile head/www/py-drf-yasg/Makefile Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/devel/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -4348,6 +4348,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 Modified: head/devel/py-dj31-django-rq/Makefile ============================================================================== --- head/devel/py-django-rq/Makefile Fri Jun 19 16:07:51 2020 (r539662) +++ head/devel/py-dj31-django-rq/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -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 @@ COMMENT= Provides Django integration for RQ (Redis Que 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 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel ${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: Modified: head/devel/py-django-rq/Makefile ============================================================================== --- head/devel/py-django-rq/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/devel/py-django-rq/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -27,7 +27,7 @@ USE_PYTHON= autoplist concurrent distutils 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: Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -1443,6 +1443,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 Modified: head/www/py-dj31-django-auth-ldap/Makefile ============================================================================== --- head/www/py-django-auth-ldap/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-django-auth-ldap/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -5,7 +5,7 @@ PORTNAME= django-auth-ldap 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 @@ COMMENT= LDAP integration for django.contrib.auth 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} Modified: head/www/py-dj31-django-cacheops/Makefile ============================================================================== --- head/www/py-django-cacheops/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-django-cacheops/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -4,7 +4,7 @@ PORTNAME= django-cacheops 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 @@ COMMENT= Slick ORM cache with automatic granular event 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 Modified: head/www/py-dj31-django-cors-headers/Makefile ============================================================================== --- head/www/py-django-cors-headers/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-django-cors-headers/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -4,7 +4,7 @@ PORTNAME= django-cors-headers 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 @@ COMMENT= Handles server headers required for Cross-Ori 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 <bsd.port.mk> Modified: head/www/py-dj31-django-debug-toolbar/Makefile ============================================================================== --- head/www/py-django-debug-toolbar/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-django-debug-toolbar/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -5,7 +5,7 @@ PORTNAME= django-debug-toolbar PORTVERSION= 3.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 @@ -13,14 +13,14 @@ COMMENT= Configurable set of panels to display debug i 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}sqlparse>=0.2.0:databases/py-sqlparse@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-debug-toolbar +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar .include <bsd.port.mk> Modified: head/www/py-dj31-django-filter/Makefile ============================================================================== --- head/www/py-django-filter/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-django-filter/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -4,7 +4,7 @@ PORTNAME= django-filter 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 @@ COMMENT= Dynamic filtering for querysets with Django 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 <bsd.port.mk> Modified: head/www/py-dj31-django-js-asset/Makefile ============================================================================== --- head/www/py-django-js-asset/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-django-js-asset/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -5,7 +5,7 @@ DISTVERSION= 1.2.2 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 @@ COMMENT= Insert script tags with additional attributes 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 <bsd.port.mk> Modified: head/www/py-dj31-django-mptt/Makefile ============================================================================== --- head/www/py-django-mptt/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-django-mptt/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -5,7 +5,7 @@ PORTNAME= django-mptt 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 @@ COMMENT= Utilities for implementing Modified Preorder 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 <bsd.port.mk> Modified: head/www/py-dj31-django-prometheus/Makefile ============================================================================== --- head/www/py-django-prometheus/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-django-prometheus/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -4,7 +4,7 @@ PORTNAME= django-prometheus 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 @@ COMMENT= Export Django monitoring metrics for Promethe 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_DESC= Memcached distributed memory caching 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 <bsd.port.mk> Modified: head/www/py-dj31-django-redis/Makefile ============================================================================== --- head/www/py-django-redis/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-django-redis/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -4,7 +4,7 @@ PORTNAME= django-redis 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 @@ COMMENT= Full featured Redis cache/session backend for 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 Modified: head/www/py-dj31-django-tables2/Makefile ============================================================================== --- head/www/py-django-tables2/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-django-tables2/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -5,7 +5,7 @@ PORTNAME= django-tables2 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 @@ COMMENT= Table/data-grid framework for Django 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 Modified: head/www/py-dj31-django-taggit/Makefile ============================================================================== --- head/www/py-django-taggit/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-django-taggit/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -4,7 +4,7 @@ PORTNAME= django-taggit 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 @@ COMMENT= Reusable Django application for simple taggin 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 <bsd.port.mk> Modified: head/www/py-dj31-django-timezone-field/Makefile ============================================================================== --- head/www/py-django-timezone-field/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-django-timezone-field/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -4,7 +4,7 @@ PORTNAME= django-timezone-field 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 @@ COMMENT= Provides database and form fields for pytz ti 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 <bsd.port.mk> Modified: head/www/py-dj31-djangorestframework/Makefile ============================================================================== --- head/www/py-djangorestframework/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-djangorestframework/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -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 @@ COMMENT= Django REST framework 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 <bsd.port.mk> Modified: head/www/py-dj31-drf-yasg/Makefile ============================================================================== --- head/www/py-drf-yasg/Makefile Tue Nov 10 07:19:37 2020 (r554810) +++ head/www/py-dj31-drf-yasg/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -4,7 +4,7 @@ PORTNAME= drf-yasg 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= BSD3CLAUSE 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 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.2.16:w ${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 Modified: head/www/py-django-auth-ldap/Makefile ============================================================================== --- head/www/py-django-auth-ldap/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-django-auth-ldap/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -21,8 +21,7 @@ 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}dj31-django-auth-ldap OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PY_SPHINX} Modified: head/www/py-django-cacheops/Makefile ============================================================================== --- head/www/py-django-cacheops/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-django-cacheops/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.1:www/ 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 Modified: head/www/py-django-cors-headers/Makefile ============================================================================== --- head/www/py-django-cors-headers/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-django-cors-headers/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -18,6 +18,6 @@ USES= python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-cors-headers +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-cors-headers .include <bsd.port.mk> Modified: head/www/py-django-debug-toolbar/Makefile ============================================================================== --- head/www/py-django-debug-toolbar/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-django-debug-toolbar/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -21,6 +21,6 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-debug-toolbar +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-debug-toolbar .include <bsd.port.mk> Modified: head/www/py-django-filter/Makefile ============================================================================== --- head/www/py-django-filter/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-django-filter/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -18,7 +18,6 @@ USES= python:3.5+ 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 <bsd.port.mk> Modified: head/www/py-django-js-asset/Makefile ============================================================================== --- head/www/py-django-js-asset/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-django-js-asset/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -19,6 +19,6 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-js-asset +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-js-asset .include <bsd.port.mk> Modified: head/www/py-django-mptt/Makefile ============================================================================== --- head/www/py-django-mptt/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-django-mptt/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -21,6 +21,6 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-happenings \ - ${PYTHON_PKGNAMEPREFIX}dj22-django-mptt + ${PYTHON_PKGNAMEPREFIX}dj31-django-mptt .include <bsd.port.mk> Modified: head/www/py-django-prometheus/Makefile ============================================================================== --- head/www/py-django-prometheus/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-django-prometheus/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www 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 Modified: head/www/py-django-redis/Makefile ============================================================================== --- head/www/py-django-redis/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-django-redis/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -21,6 +21,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>=0:databa USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-redis + NO_ARCH= yes do-test: Modified: head/www/py-django-tables2/Makefile ============================================================================== --- head/www/py-django-tables2/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-django-tables2/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -18,6 +18,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=0:www/py USES= python:3.5+ USE_PYTHON= distutils autoplist +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-tables2 + NO_ARCH= yes OPTIONS_DEFINE= TABLIB Modified: head/www/py-django-taggit/Makefile ============================================================================== --- head/www/py-django-taggit/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-django-taggit/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -18,6 +18,6 @@ USES= python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-taggit .include <bsd.port.mk> Modified: head/www/py-django-timezone-field/Makefile ============================================================================== --- head/www/py-django-timezone-field/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-django-timezone-field/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -19,6 +19,6 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist NO_ARCH= yes -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj22-django-timezone-field +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-timezone-field .include <bsd.port.mk> Modified: head/www/py-djangorestframework/Makefile ============================================================================== --- head/www/py-djangorestframework/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-djangorestframework/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -20,7 +20,7 @@ USES= python:3.5+ USE_PYTHON= distutils autoplist CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}djangorestframework3* \ - ${PYTHON_PKGNAMEPREFIX}dj22-djangorestframework + ${PYTHON_PKGNAMEPREFIX}dj31-djangorestframework NO_ARCH= yes .include <bsd.port.mk> Modified: head/www/py-drf-yasg/Makefile ============================================================================== --- head/www/py-drf-yasg/Makefile Tue Nov 10 08:00:43 2020 (r554816) +++ head/www/py-drf-yasg/Makefile Tue Nov 10 08:47:03 2020 (r554817) @@ -26,6 +26,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.2.16:w USES= python:3.5+ USE_PYTHON= distutils autoplist +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}py-dj31-drf-yasg + NO_ARCH= yes OPTIONS_DEFINE= VALIDATION
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011100847.0AA8l4ak070642>