|
 |
4d73ff1 |
diff --git a/setup.py b/setup.py
|
|
|
ee9ece7 |
index 57b2b5a..201b0b7 100644
|
|
|
4d73ff1 |
--- a/setup.py
|
|
|
4d73ff1 |
+++ b/setup.py
|
|
|
3fc5522 |
@@ -3,6 +3,7 @@ from __future__ import print_function
|
|
|
3fc5522 |
|
|
|
3fc5522 |
import codecs
|
|
|
3fc5522 |
import os
|
|
|
3fc5522 |
+import sys
|
|
|
3fc5522 |
|
|
|
3fc5522 |
from setuptools import setup, find_packages
|
|
|
3fc5522 |
|
|
|
3fc5522 |
@@ -16,29 +17,14 @@ requirements = [
|
|
|
ee9ece7 |
'docker-pycreds >= 0.3.0'
|
|
|
4d73ff1 |
]
|
|
 |
769227b |
|
|
|
769227b |
-extras_require = {
|
|
|
769227b |
- ':python_version < "3.5"': 'backports.ssl_match_hostname >= 3.5',
|
|
|
769227b |
- # While not imported explicitly, the ipaddress module is required for
|
|
|
769227b |
- # ssl_match_hostname to verify hosts match with certificates via
|
|
|
769227b |
- # ServerAltname: https://pypi.python.org/pypi/backports.ssl_match_hostname
|
|
|
769227b |
- ':python_version < "3.3"': 'ipaddress >= 1.0.16',
|
|
|
3fc5522 |
+if sys.version_info[:2] < (3, 5):
|
|
|
3fc5522 |
+ requirements.append('backports.ssl_match_hostname >= 3.5')
|
|
|
4d73ff1 |
|
|
|
4d73ff1 |
- # win32 APIs if on Windows (required for npipe support)
|
|
|
4d73ff1 |
- # Python 3.6 is only compatible with v220 ; Python < 3.5 is not supported
|
|
|
4d73ff1 |
- # on v220 ; ALL versions are broken for v222 (as of 2018-01-26)
|
|
|
4d73ff1 |
- ':sys_platform == "win32" and python_version < "3.6"': 'pypiwin32==219',
|
|
|
4d73ff1 |
- ':sys_platform == "win32" and python_version >= "3.6"': 'pypiwin32==220',
|
|
|
3fc5522 |
-
|
|
|
769227b |
- # If using docker-py over TLS, highly recommend this option is
|
|
|
769227b |
- # pip-installed or pinned.
|
|
|
769227b |
-
|
|
|
769227b |
- # TODO: if pip installing both "requests" and "requests[security]", the
|
|
|
769227b |
- # extra package from the "security" option are not installed (see
|
|
|
769227b |
- # https://github.com/pypa/pip/issues/4391). Once that's fixed, instead of
|
|
|
769227b |
- # installing the extra dependencies, install the following instead:
|
|
|
769227b |
- # 'requests[security] >= 2.5.2, != 2.11.0, != 2.12.2'
|
|
|
769227b |
- 'tls': ['pyOpenSSL>=0.14', 'cryptography>=1.3.4', 'idna>=2.0.0'],
|
|
|
769227b |
-}
|
|
|
769227b |
+# While not imported explicitly, the ipaddress module is required for
|
|
|
769227b |
+# ssl_match_hostname to verify hosts match with certificates via
|
|
|
769227b |
+# ServerAltname: https://pypi.python.org/pypi/backports.ssl_match_hostname
|
|
|
769227b |
+if sys.version_info[:2] < (3, 3):
|
|
|
769227b |
+ requirements.append('ipaddress >= 1.0.16')
|
|
|
769227b |
|
|
|
769227b |
version = None
|
|
|
769227b |
exec(open('docker/version.py').read())
|
|
|
3fc5522 |
@@ -65,7 +51,6 @@ setup(
|
|
|
769227b |
packages=find_packages(exclude=["tests.*", "tests"]),
|
|
|
769227b |
install_requires=requirements,
|
|
|
769227b |
tests_require=test_requirements,
|
|
|
769227b |
- extras_require=extras_require,
|
|
|
769227b |
zip_safe=False,
|
|
|
769227b |
test_suite='tests',
|
|
|
769227b |
classifiers=[
|