git: c8750870b112 - main - www/py-wagtail: Prepare for dj32-django-taggit 2.0.0

From: Kai Knoblich <kai_at_FreeBSD.org>
Date: Tue, 18 Jan 2022 18:19:48 UTC
The branch main has been updated by kai:

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

commit c8750870b112ad1c2953b26b387f14311910baff
Author:     Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2022-01-18 17:52:05 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2022-01-18 18:18:10 +0000

    www/py-wagtail: Prepare for dj32-django-taggit 2.0.0
    
    * Relax the version requirements in "setup.py" to avoid build/runtime
      issues with newer version of www/py-dj32-django-taggit.
    
    * Bump PORTREVISION due package change.
    
    Approved by:    sunpoet (maintainer, via e-mail)
---
 www/py-wagtail/Makefile             | 3 ++-
 www/py-wagtail/files/patch-setup.py | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/www/py-wagtail/Makefile b/www/py-wagtail/Makefile
index 7d6f7d07b35e..5b6cf1b70644 100644
--- a/www/py-wagtail/Makefile
+++ b/www/py-wagtail/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	wagtail
 PORTVERSION=	2.14.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}anyascii>=0.1.5:textproc/py-anyascii@${PY_FL
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.8<4.11:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django32>=3.0<3.3:www/py-django32@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj32-django-modelcluster>=5.2<6.0:www/py-dj32-django-modelcluster@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj32-django-taggit>=1.0<2.0:www/py-dj32-django-taggit@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dj32-django-taggit>=1.0:www/py-dj32-django-taggit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj32-django-treebeard>=4.2.0<5.0:www/py-dj32-django-treebeard@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dj32-djangorestframework>=3.11.1<4.0:www/py-dj32-djangorestframework@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}draftjs-exporter>=2.1.5:www/py-draftjs-exporter@${PY_FLAVOR} \
diff --git a/www/py-wagtail/files/patch-setup.py b/www/py-wagtail/files/patch-setup.py
index 9e8a5aac9159..6515d40591b7 100644
--- a/www/py-wagtail/files/patch-setup.py
+++ b/www/py-wagtail/files/patch-setup.py
@@ -1,6 +1,11 @@
---- setup.py.orig	2021-07-13 11:20:32 UTC
+--- setup.py.orig	2021-10-14 16:25:39 UTC
 +++ setup.py
-@@ -26,9 +26,9 @@ install_requires = [
+@@ -22,13 +22,13 @@ except ImportError:
+ install_requires = [
+     "Django>=3.0,<3.3",
+     "django-modelcluster>=5.2,<6.0",
+-    "django-taggit>=1.0,<2.0",
++    "django-taggit>=1.0",
      "django-treebeard>=4.2.0,<5.0,!=4.5",
      "djangorestframework>=3.11.1,<4.0",
      "django-filter>=2.2,<3.0",