From 37f1275a4c71ec0e29ed37bb6560f6896b8f2944 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" <1330696+mr-c@users.noreply.github.com> Date: Fri, 18 May 2018 10:41:30 +0300 Subject: [PATCH] relax subprocess dependency (#73) --- appveyor.yml | 2 ++ cwltest/tests/util.py | 7 ++++++- requirements.txt | 2 +- setup.py | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d005989..78a627f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,7 +24,9 @@ environment: PYTHON_ARCH: "64" install: + - "%PYTHON%\\python.exe -m pip install -U setuptools^>=20.3" - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" + # Note the use of a `^` to escape the `>` build_script: - | diff --git a/cwltest/tests/util.py b/cwltest/tests/util.py index 759a34d..caeda04 100644 --- a/cwltest/tests/util.py +++ b/cwltest/tests/util.py @@ -1,7 +1,12 @@ from __future__ import absolute_import import os +import sys + +if sys.version_info < (3, 0): + import subprocess32 as subprocess +else: + import subprocess -import subprocess from pkg_resources import (Requirement, ResolutionError, # type: ignore resource_filename) diff --git a/requirements.txt b/requirements.txt index c9621d1..0442456 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ schema-salad >= 1.14 typing>=3.6,<3.7; python_version < '3.5' futures >= 3.0.5; python_version == '2.7' -subprocess32 == 3.5.0rc1; python_version < '3' +subprocess32 >= 3.5.0; python_version < '3' junit-xml >= 1.8 diff --git a/setup.py b/setup.py index 9c206cc..c0443c0 100755 --- a/setup.py +++ b/setup.py @@ -49,6 +49,6 @@ cmdclass={'egg_info': tagger}, python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4', extras_require={':python_version<"3"': [ - 'futures >= 3.0.5', 'subprocess32 == 3.5.0rc1'], + 'futures >= 3.0.5', 'subprocess32 >= 3.5.0'], ':python_version<"3.5"': ['typing >= 3.5.2'] } )