diff options
| author | Brad Warren <bmw@users.noreply.github.com> | 2016-12-01 21:47:08 +0300 |
|---|---|---|
| committer | Peter Eckersley <pde@users.noreply.github.com> | 2016-12-01 21:47:08 +0300 |
| commit | edbb3a73c6085219bef0cbf008bd1c82088bfcf6 (patch) | |
| tree | abcac7f5c20b16c1fdd383bc1d99e41d58569bd1 /acme | |
| parent | 0289457a931984b83826be3068559287aa14c4cb (diff) | |
Take advantage of urllib3 pyopenssl rewrite (#3805)
* pin requests version in py26-oldest
* Determine requests security deps dynamically
Starting with requests 2.12, pyasn1 and ndg-httpsclient are no longer
needed to inject pyopenssl into urllib3. This change allows us to
determine whether or not these dependencies are required at install
time. If an older version of requests is used, these packages are
still installed. If a new version of requests is used, they are not
reducing the number of dependencies we have.
* Bump requests version in certbot-auto
* Use pkg_resources in activate test
Due to pip's lack of dependency resolution, the change to use
requests[extras] causes errors in acme.util_test because pkg_resources
accurately detects the "missing" dependency.
There isn't a real problem here. The problem comes from a brand new
requests and ancient pyopenssl as well as a unit test for
functionality we plan to remove in our next release. I modified
the unit test to fix the problem for now.
* Use six instead of pkg_resources for test
* Require requests<=2.11.1 in py27-oldest test
If we don't do this, we get test failures for the certbot package
which is actually a good thing! pkg_resources is catching the
unlikely but possible problem I describe in #3803 and erroring out
saying it is missing the necessary dependencies to run certbot.
Good job package resources.
* Undo changes to acme.util_test
Diffstat (limited to 'acme')
| -rw-r--r-- | acme/setup.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/acme/setup.py b/acme/setup.py index 895889c7c..5524a6734 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -11,13 +11,11 @@ install_requires = [ # load_pem_private/public_key (>=0.6) # rsa_recover_prime_factors (>=0.8) 'cryptography>=0.8', - 'ndg-httpsclient', # urllib3 InsecurePlatformWarning (#304) - 'pyasn1', # urllib3 InsecurePlatformWarning (#304) # Connection.set_tlsext_host_name (>=0.13) 'PyOpenSSL>=0.13', 'pyrfc3339', 'pytz', - 'requests', + 'requests[security]>=2.4.1', # security extras added in 2.4.1 # For pkg_resources. >=1.0 so pip resolves it to a version cryptography # will tolerate; see #2599: 'setuptools>=1.0', |