From 1515bb841944274cceedfbf60ec173c2f71167b8 Mon Sep 17 00:00:00 2001 From: harens <12570877+harens@users.noreply.github.com> Date: Sun, 15 Jan 2023 12:14:08 +0000 Subject: [PATCH] py-requests: update to 2.28.2 --- python/py-requests/Portfile | 13 +++----- python/py-requests/files/patch-c57f1f0c.diff | 35 -------------------- 2 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 python/py-requests/files/patch-c57f1f0c.diff diff --git a/python/py-requests/Portfile b/python/py-requests/Portfile index a63d3e67f8b26..e405b9b4ae7c9 100644 --- a/python/py-requests/Portfile +++ b/python/py-requests/Portfile @@ -4,8 +4,8 @@ PortSystem 1.0 PortGroup python 1.0 name py-requests -version 2.28.1 -revision 1 +version 2.28.2 +revision 0 categories-append devel license Apache-2 supported_archs noarch @@ -28,9 +28,9 @@ long_description Most existing Python modules for dealing HTTP \ homepage https://requests.readthedocs.io/ -checksums rmd160 ed0fccd3aa2f726c7f96137cef3c227e2789f8a4 \ - sha256 7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 \ - size 109805 +checksums rmd160 045ace79b8b214ceaf944574e99873a272cbb9e6 \ + sha256 98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf \ + size 108206 if {${name} ne ${subport}} { @@ -58,9 +58,6 @@ if {${name} ne ${subport}} { python.pep517 no depends_build-append \ port:py${python.version}-setuptools - } else { - # backport commit c57f1f0c from master branch to allow charset-normalizer<4.0 - patchfiles-append patch-c57f1f0c.diff } if {${python.version} <= 35} { diff --git a/python/py-requests/files/patch-c57f1f0c.diff b/python/py-requests/files/patch-c57f1f0c.diff deleted file mode 100644 index 4d081de7cacb0..0000000000000 --- a/python/py-requests/files/patch-c57f1f0c.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- requests/__init__.py -+++ requests/__init__.py -@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver - 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.py -+++ setup.py -@@ -59,7 +59,7 @@ def run_tests(self): - 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", ---- setup.cfg -+++ setup.cfg -@@ -5,7 +5,7 @@ - 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 -