<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/714a95bcd1e281f84586fd72d10097424f630f1b">https://github.com/macports/macports-ports/commit/714a95bcd1e281f84586fd72d10097424f630f1b</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 714a95b  py-requests: fix runtime incompatibility with urllib3 1.25
</span>714a95b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 714a95bcd1e281f84586fd72d10097424f630f1b
</span>Author: Andrew Stromnov <stromnov@macports.org>
AuthorDate: Wed Apr 24 18:18:45 2019 +0300

<span style='display:block; white-space:pre;color:#404040;'>    py-requests: fix runtime incompatibility with urllib3 1.25
</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/58382
</span>---
 python/py-requests/Portfile                              |  6 +++++-
 python/py-requests/files/patch-requests___init__.py.diff | 11 +++++++++++
 python/py-requests/files/patch-setup.py.diff             | 11 +++++++++++
 3 files changed, 27 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 4ba15a2c..e48599d 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.21.0
<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
 platforms           darwin
 license             Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,5 +42,9 @@ if {${name} ne ${subport}} {
</span>                         port:py${python.version}-urllib3 \
                         port:py${python.version}-certifi
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # py-urllib3 1.25 breaks py-requests: https://trac.macports.org/ticket/58382
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-requests___init__.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     livecheck.type      none
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-requests/files/patch-requests___init__.py.diff b/python/py-requests/files/patch-requests___init__.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..22e2238
</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-requests___init__.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- requests/__init__.py.orig      2019-04-24 18:12:42.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ requests/__init__.py   2019-04-24 18:12:58.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # urllib3 >= 1.21.1, <= 1.24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     assert major == 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     assert minor >= 21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    assert minor <= 24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    assert minor <= 25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # Check chardet for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     major, minor, patch = chardet_version.split('.')[:3]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-requests/files/patch-setup.py.diff b/python/py-requests/files/patch-setup.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..60655e8
</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-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig  2019-04-24 18:12:00.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2019-04-24 18:13:13.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'chardet>=3.0.2,<3.1.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'idna>=2.5,<2.9',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    'urllib3>=1.21.1,<1.25',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    'urllib3>=1.21.1,<=1.25',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     'certifi>=2017.4.17'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span></pre><pre style='margin:0'>

</pre>