Fix pywin32 dep, widen range to >=227,<400

Signed-off-by: Justin Mahlik <j38999128+jmahlik@users.noreply.github.com>
docker · Jun 13, 2021 · 86f7f59 · 86f7f59
1 parent 96c1272
commit 86f7f59
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -11,7 +11,7 @@ paramiko==2.4.2
 pycparser==2.17
 pyOpenSSL==18.0.0
 pyparsing==2.2.0
-pywin32==227; sys_platform == 'win32'
+pywin32>=227,<400; sys_platform == 'win32'
 requests==2.20.0
 urllib3==1.24.3
 websocket-client==0.56.0
diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
 
 extras_require = {
     # win32 APIs if on Windows (required for npipe support)
-    ':sys_platform == "win32"': 'pywin32==227',
+    ':sys_platform == "win32"': 'pywin32>=227,<400',
 
     # If using docker-py over TLS, highly recommend this option is
     # pip-installed or pinned.

diff --git a/tox.ini b/tox.ini
@@ -1,14 +1,28 @@
 [tox]
-envlist = py36, py37, flake8
+# All envs will be run based on platform
 skipsdist=True
 
-[testenv]
+[testenv:py{36,37,38,39}]
 usedevelop=True
 commands =
     py.test -v --cov=docker {posargs:tests/unit}
 deps =
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/requirements.txt
+platform = linux|darwin 
+
+[testenv:py{36,37,38,39}-pywin32{277, 300, 301}]
+description = Test windows deps across many python versions
+usedevelop=True
+deps =
+    -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/requirements.txt
+    pywin32277: pywin32==227
+    pywin32300: pywin32==300
+    pywin32301: pywin32==301
+platform = win32
+commands =
+    py.test -v --cov=docker {posargs:tests/unit}
 
 [testenv:flake8]
 commands = flake8 docker tests setup.py