git: 32dfc9b254a9 - main - Seahub and Django depends: Update Django to 3.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Richard Gallamore <ultima_at_FreeBSD.org>
Date: Thu, 07 Apr 2022 16:53:53 UTC
The branch main has been updated by ultima:

URL: https://cgit.FreeBSD.org/ports/commit/?id=32dfc9b254a9478752e74ef2372da24cb81cd001

commit 32dfc9b254a9478752e74ef2372da24cb81cd001
Author:     Richard Gallamore <ultima@FreeBSD.org>
AuthorDate: 2022-04-07 16:42:11 +0000
Commit:     Richard Gallamore <ultima@FreeBSD.org>
CommitDate: 2022-04-07 16:51:47 +0000

    Seahub and Django depends: Update Django to 3.2
    
    This is the initial commit for the migration from Django
    2.2 to Django 3.2. This migration is needed due to Django 2.2
    becoming is EOL as of 4/1/2022.
    
    PR: 261313
    Approved by: kai
    Differential Revision: https://reviews.freebsd.org/D34456
---
 www/py-django-constance/Makefile       |  3 ++-
 www/py-django-picklefield/Makefile     |  3 ++-
 www/py-django-ranged-response/Makefile |  4 ++--
 www/py-django-simple-captcha/Makefile  |  3 ++-
 www/py-django-statici18n/Makefile      |  3 ++-
 www/py-django-webpack-loader/Makefile  |  3 ++-
 www/seahub/Makefile                    | 13 +++++++------
 7 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/www/py-django-constance/Makefile b/www/py-django-constance/Makefile
index f907d02c5b80..af9bf7e3af46 100644
--- a/www/py-django-constance/Makefile
+++ b/www/py-django-constance/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-constance
 PORTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -14,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-picklefield>=0:www/py-django-picklefield@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}django32>=1.8:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist distutils
diff --git a/www/py-django-picklefield/Makefile b/www/py-django-picklefield/Makefile
index d86fc6c1b9b1..561a8c8c638c 100644
--- a/www/py-django-picklefield/Makefile
+++ b/www/py-django-picklefield/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-picklefield
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # Reminder: www/seahub depends on django, changing django version may break seahub
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/www/py-django-ranged-response/Makefile b/www/py-django-ranged-response/Makefile
index 90f57a941b0b..c9b96b0552ba 100644
--- a/www/py-django-ranged-response/Makefile
+++ b/www/py-django-ranged-response/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	django-ranged-response
 DISTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +10,7 @@ COMMENT=	Modified Django FileResponse that adds Content-Range headers
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=0:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=0:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
diff --git a/www/py-django-simple-captcha/Makefile b/www/py-django-simple-captcha/Makefile
index d4d1c3fe94cf..4ae063f9fe57 100644
--- a/www/py-django-simple-captcha/Makefile
+++ b/www/py-django-simple-captcha/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-simple-captcha
 PORTVERSION=	0.5.14
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Simple, yet powerful, Django captcha application
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.7.0:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=1.7.0:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-ranged-response>=0.2.0:www/py-django-ranged-response@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR} \
 		${PY_PILLOW}
diff --git a/www/py-django-statici18n/Makefile b/www/py-django-statici18n/Makefile
index de9b234f4671..6ee7feaab35c 100644
--- a/www/py-django-statici18n/Makefile
+++ b/www/py-django-statici18n/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-statici18n
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Helper for generating Javascript catalog to static files
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.2:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-appconf>=1.0:www/py-django-appconf@${PY_FLAVOR}
 
 USES=		python:3.6+
diff --git a/www/py-django-webpack-loader/Makefile b/www/py-django-webpack-loader/Makefile
index 68d03106d2ed..d20458de0c22 100644
--- a/www/py-django-webpack-loader/Makefile
+++ b/www/py-django-webpack-loader/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	django-webpack-loader
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
@@ -13,7 +14,7 @@ COMMENT=	Transparently use webpack with Django
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=2.0:www/py-django22@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=2.0:www/py-django32@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist concurrent
diff --git a/www/seahub/Makefile b/www/seahub/Makefile
index 6eabf42a4069..527f0bb8c744 100644
--- a/www/seahub/Makefile
+++ b/www/seahub/Makefile
@@ -2,6 +2,7 @@ PORTNAME=	seahub
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${SEAHUB_VER}
 DISTVERSIONSUFFIX=	-server
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	ultima@FreeBSD.org
@@ -10,11 +11,11 @@ COMMENT=	Web frontend for Seafile
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=0:www/py-django22@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django32>=0:www/py-django32@${PY_FLAVOR}
 
 RUN_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/www/haiwen/seafile-server/seafile/bin/seaf-server:net-mgmt/seafile-server \
-		${PYTHON_PKGNAMEPREFIX}django22>=0:www/py-django22@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django32>=0:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-statici18n>=0:www/py-django-statici18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-webpack-loader>=0:www/py-django-webpack-loader@${PY_FLAVOR} \
@@ -23,17 +24,17 @@ RUN_DEPENDS=	bash:shells/bash \
 		${PYTHON_PKGNAMEPREFIX}django-picklefield>=0:www/py-django-picklefield@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qrcode>0:textproc/py-qrcode@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}django-formtools>=0:www/py-django-formtools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}django-formtools>=2.3:www/py-django-formtools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-simple-captcha>=0:www/py-django-simple-captcha@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}djangorestframework>=0:www/py-djangorestframework@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj32-djangorestframework>=0:www/py-dj32-djangorestframework@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysaml26>=6.5.1:security/py-pysaml26@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pymysql>0:databases/py-pymysql@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pymysql>0:databases/py-pymysql@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cffi>=1.14.0:devel/py-cffi@${PY_FLAVOR}
 
 USES=		gettext-tools:build python:3.7+ shebangfix
 USE_GITHUB=	yes