Skip to content

Commit

Permalink
relax subprocess dependency (#73)
Browse files Browse the repository at this point in the history
  • Loading branch information
mr-c authored May 18, 2018
1 parent 6226d05 commit 37f1275
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- |
Expand Down
7 changes: 6 additions & 1 deletion cwltest/tests/util.py
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'] }
)

0 comments on commit 37f1275

Please sign in to comment.