diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2018-01-26 13:45:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 13:45:10 -0800 |
| commit | 9538258371b1573e2455db41ac0d480e4b7ade9c (patch) | |
| tree | 55c8e4d8fc46e09244535fa3660c8f7c9da445a4 | |
| parent | ba46201ca6990ae078caf8368322c646d01a8763 (diff) | |
| parent | a5490ad0be6840961758d090f573ceb1ef0a5d96 (diff) | |
| download | docker-py-9538258371b1573e2455db41ac0d480e4b7ade9c.tar.gz | |
Merge pull request #1871 from docker/fix-appveyor
Fix appveyor tests
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | setup.py | 9 | ||||
| -rw-r--r-- | win32-requirements.txt | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt index f3c61e7..1602750 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,8 @@ packaging==16.8 pycparser==2.17 pyOpenSSL==17.0.0 pyparsing==2.2.0 +pypiwin32==219; sys_platform == 'win32' and python_version < '3.6' +pypiwin32==220; sys_platform == 'win32' and python_version >= '3.6' requests==2.14.2 six==1.10.0 websocket-client==0.40.0 @@ -26,9 +26,6 @@ requirements = [ 'docker-pycreds >= 0.2.1' ] -if sys.platform == 'win32': - requirements.append('pypiwin32 >= 219') - extras_require = { ':python_version < "3.5"': 'backports.ssl_match_hostname >= 3.5', # While not imported explicitly, the ipaddress module is required for @@ -36,6 +33,12 @@ extras_require = { # ServerAltname: https://pypi.python.org/pypi/backports.ssl_match_hostname ':python_version < "3.3"': 'ipaddress >= 1.0.16', + # win32 APIs if on Windows (required for npipe support) + # Python 3.6 is only compatible with v220 ; Python < 3.5 is not supported + # on v220 ; ALL versions are broken for v222 (as of 2018-01-26) + ':sys_platform == "win32" and python_version < "3.6"': 'pypiwin32==219', + ':sys_platform == "win32" and python_version >= "3.6"': 'pypiwin32==220', + # If using docker-py over TLS, highly recommend this option is # pip-installed or pinned. diff --git a/win32-requirements.txt b/win32-requirements.txt index 6db52a5..bc04b49 100644 --- a/win32-requirements.txt +++ b/win32-requirements.txt @@ -1,2 +1 @@ -r requirements.txt -pypiwin32>=219 |