git: 90657ebb4146 - main - www/py-requests: Allow build with py-charset-normalizer 3.x

The branch main has been updated by sunpoet:

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

commit 90657ebb4146ac4674aea2ae891ef125b79b48d4
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-12-30 08:46:48 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-12-30 09:05:15 +0000

    www/py-requests: Allow build with py-charset-normalizer 3.x
    
    - Bump PORTREVISION for package change
    
    Obtained from:  https://github.com/psf/requests/commit/c57f1f0ca10e61771b459c857182c23626607312
---
 www/py-requests/Makefile                       |  3 ++-
 www/py-requests/files/patch-charset-normalizer | 37 ++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/www/py-requests/Makefile b/www/py-requests/Makefile
index 4054eb0624d2..15791fce9be0 100644
--- a/www/py-requests/Makefile
+++ b/www/py-requests/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	requests
 PORTVERSION=	2.28.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2<3:textproc/py-charset-normalizer@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2<4:textproc/py-charset-normalizer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>=2.5<4:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1,1<1.27,1:net/py-urllib3@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.6:net/py-pysocks@${PY_FLAVOR} \
diff --git a/www/py-requests/files/patch-charset-normalizer b/www/py-requests/files/patch-charset-normalizer
new file mode 100644
index 000000000000..08e9a348b36d
--- /dev/null
+++ b/www/py-requests/files/patch-charset-normalizer
@@ -0,0 +1,37 @@
+Obtained from:	https://github.com/psf/requests/commit/c57f1f0ca10e61771b459c857182c23626607312
+
+--- requests/__init__.py.orig	2022-06-29 15:09:45 UTC
++++ requests/__init__.py
+@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_versi
+     elif charset_normalizer_version:
+         major, minor, patch = charset_normalizer_version.split(".")[:3]
+         major, minor, patch = int(major), int(minor), int(patch)
+-        # charset_normalizer >= 2.0.0 < 3.0.0
+-        assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0)
++        # charset_normalizer >= 2.0.0 < 4.0.0
++        assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
+     else:
+         raise Exception("You need either charset_normalizer or chardet installed")
+ 
+--- setup.cfg.orig	2022-06-29 15:13:33 UTC
++++ setup.cfg
+@@ -5,7 +5,7 @@ provides-extra = 
+ 	use_chardet_on_py3
+ requires-dist = 
+ 	certifi>=2017.4.17
+-	charset_normalizer>=2,<3
++	charset_normalizer>=2,<4
+ 	idna>=2.5,<4
+ 	urllib3>=1.21.1,<1.27
+ 
+--- setup.py.orig	2022-06-29 15:09:45 UTC
++++ setup.py
+@@ -59,7 +59,7 @@ if sys.argv[-1] == "publish":
+     sys.exit()
+ 
+ requires = [
+-    "charset_normalizer>=2,<3",
++    "charset_normalizer>=2,<4",
+     "idna>=2.5,<4",
+     "urllib3>=1.21.1,<1.27",
+     "certifi>=2017.4.17",