From da7d74756b234ee5f6363ff3c2b6704e98ec5270 Mon Sep 17 00:00:00 2001
From: Adrien Ferrand <ferrand.ad@gmail.com>
Date: Fri, 17 May 2019 12:31:26 +0200
Subject: [PATCH] Limit transitive dependency on urllib3 to <1.25 to fulfill
 requirements in certbot-dns-route53 throught botocore dependency.

---
 acme/setup.py                | 3 +++
 certbot-dns-route53/setup.py | 2 +-
 setup.py                     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/acme/setup.py b/acme/setup.py
index 56a9a63f3..cc5bb7508 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -7,6 +7,9 @@ version = '0.35.0.dev0'
 
 # Please update tox.ini when modifying dependency version requirements
 install_requires = [
+    # prevent request to transitively install urllib 1.25+
+    # that is still not supported by all libraries (eg. botocore)
+    'urllib3<1.25',
     # load_pem_private/public_key (>=0.6)
     # rsa_recover_prime_factors (>=0.8)
     'cryptography>=1.2.3',
diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py
index 09cd4acd2..ebb8a35f5 100644
--- a/certbot-dns-route53/setup.py
+++ b/certbot-dns-route53/setup.py
@@ -7,7 +7,7 @@ version = '0.35.0.dev0'
 # acme/certbot version.
 install_requires = [
     'acme>=0.29.0',
-    'certbot>=0.34.0',
+    'certbot>=0.35.0.dev0',
     'boto3',
     'mock',
     'setuptools',
diff --git a/setup.py b/setup.py
index 09ffe8cb5..84d1d707d 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ version = meta['version']
 # specified here to avoid masking the more specific request requirements in
 # acme. See https://github.com/pypa/pip/issues/988 for more info.
 install_requires = [
-    'acme>=0.29.0',
+    'acme>=0.35.0.dev0',
     # We technically need ConfigArgParse 0.10.0 for Python 2.6 support, but
     # saying so here causes a runtime error against our temporary fork of 0.9.3
     # in which we added 2.6 support (see #2243), so we relax the requirement.