Skip to content

Commit 1d4d1e4

Browse files
committed
enable pip conflict checker
1 parent 597d92b commit 1d4d1e4

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
'ruamel.yaml >= 0.12.4, < 0.12.5',
4848
'rdflib >= 4.2.0, < 4.3.0',
4949
'shellescape >= 3.4.1, < 3.5',
50-
'schema-salad >= 2.1.20161216210732, < 3',
50+
'schema-salad >= 2.1.20161221160224, < 3',
5151
'typing >= 3.5.2, < 3.6',
5252
'cwltest >= 1.0.20160907111242',
5353
'pathlib2 >= 2.1.0'

tox.ini

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
#envlist = py35-lint,py34-lint,py33-lint,py27-lint,py35-unit,py34-unit,py33-unit,py27-unit
3-
envlist = py27-lint, py27-unit, py35-mypy
3+
envlist = py27-lint, py27-unit, pip27-pipconflictchecker, py35-mypy
44
skipsdist = True
55

66
[tox:travis]
@@ -38,6 +38,11 @@ commands = flake8 cwltool setup.py
3838
whitelist_externals = flake8
3939
deps = flake8
4040

41+
[testenv:py27-pipconflictchecker]
42+
commands = pipconflictchecker
43+
whitelist_externals = pipconflictchecker
44+
deps = pip-conflict-checker
45+
4146
[testenv:py35-unit]
4247
commands = python setup.py test
4348

0 commit comments

Comments
 (0)