<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/65cb5fbdb12aaeb3a0d63aecd0a72371b2c1f94f">https://github.com/macports/macports-ports/commit/65cb5fbdb12aaeb3a0d63aecd0a72371b2c1f94f</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 65cb5fb  py-requests: fix urllib3 runtime incompatibility
</span>65cb5fb is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 65cb5fbdb12aaeb3a0d63aecd0a72371b2c1f94f
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Apr 27 10:59:00 2019 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-requests: fix urllib3 runtime incompatibility
</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/58394
</span>---
 python/py-requests/Portfile                              | 6 ++++--
 python/py-requests/files/patch-requests___init__.py.diff | 2 +-
 python/py-requests/files/patch-setup.py.diff             | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

<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 e48599d..aeadd15 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            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            2
</span> categories-append   devel
 platforms           darwin
 license             Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +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:#ffe0e0;'>-    # py-urllib3 1.25 breaks py-requests: https://trac.macports.org/ticket/58382
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # py-urllib3 >= 1.25 breaks py-requests, remove upon next update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # see: https://trac.macports.org/ticket/58382 and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # https://trac.macports.org/ticket/58394
</span>     patchfiles-append   patch-requests___init__.py.diff \
                         patch-setup.py.diff
 
<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><span style='display:block; white-space:pre;color:#808080;'>index 22e2238..10dfd0e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-requests/files/patch-requests___init__.py.diff
</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;'>@@ -5,7 +5,7 @@
</span>      assert major == 1
      assert minor >= 21
 -    assert minor <= 24
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+    assert minor <= 25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    assert minor <= 26
</span>  
      # Check chardet for compatibility.
      major, minor, patch = chardet_version.split('.')[:3]
<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><span style='display:block; white-space:pre;color:#808080;'>index 60655e8..d9054c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-requests/files/patch-setup.py.diff
</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;'>@@ -5,7 +5,7 @@
</span>      'chardet>=3.0.2,<3.1.0',
      'idna>=2.5,<2.9',
 -    'urllib3>=1.21.1,<1.25',
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+    'urllib3>=1.21.1,<=1.25',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    'urllib3>=1.21.1,<=1.26',
</span>      'certifi>=2017.4.17'
  
  ]
</pre><pre style='margin:0'>

</pre>