<pre style='margin:0'>
Andrew Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e7d4aeab9cfdc16f0d3b11541db06e21bb275098">https://github.com/macports/macports-ports/commit/e7d4aeab9cfdc16f0d3b11541db06e21bb275098</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new e7d4aeab9cf py-requests: allow py-charset-normalizer 3.x as a dependency
</span>e7d4aeab9cf is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e7d4aeab9cfdc16f0d3b11541db06e21bb275098
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Thu Nov 24 19:55:26 2022 +0300

<span style='display:block; white-space:pre;color:#404040;'>    py-requests: allow py-charset-normalizer 3.x as a dependency
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    backport commit https://github.com/psf/requests/commit/c57f1f0ca10e61771b459c857182c23626607312
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/66338
</span>---
 python/py-requests/Portfile                  |  6 ++++-
 python/py-requests/files/patch-c57f1f0c.diff | 35 ++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-requests/Portfile b/python/py-requests/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da3d0389f5d..a63d3e67f8b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-requests/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-requests/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup           python 1.0
</span> 
 name                py-requests
 version             2.28.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories-append   devel
 license             Apache-2
 supported_archs     noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,11 @@ if {${name} ne ${subport}} {
</span>         python.pep517       no
         depends_build-append \
                             port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # backport commit c57f1f0c from master branch to allow charset-normalizer<4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-c57f1f0c.diff
</span>     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     if {${python.version} <= 35} {
         depends_lib-replace \
                             port:py${python.version}-charset-normalizer \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-requests/files/patch-c57f1f0c.diff b/python/py-requests/files/patch-c57f1f0c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4d081de7cac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-requests/files/patch-c57f1f0c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- requests/__init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ requests/__init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     elif charset_normalizer_version:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         major, minor, patch = charset_normalizer_version.split(".")[:3]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         major, minor, patch = int(major), int(minor), int(patch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        # charset_normalizer >= 2.0.0 < 3.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        # charset_normalizer >= 2.0.0 < 4.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         raise Exception("You need either charset_normalizer or chardet installed")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,7 @@ def run_tests(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     sys.exit()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    "charset_normalizer>=2,<3",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "charset_normalizer>=2,<4",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "idna>=2.5,<4",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "urllib3>=1.21.1,<1.27",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     "certifi>=2017.4.17",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,7 +5,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   use_chardet_on_py3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires-dist = 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   certifi>=2017.4.17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  charset_normalizer>=2,<3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  charset_normalizer>=2,<4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   idna>=2.5,<4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   urllib3>=1.21.1,<1.27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>