Skip to content

Commit ebdf27d

Browse files
authored
Merge pull request #71 from common-workflow-language/pip-conflict-checker
drop html5lib pin, add pip-conflict-check
2 parents 999d689 + 2aecb05 commit ebdf27d

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
'ruamel.yaml >= 0.12.4, < 0.12.5',
3434
'rdflib >= 4.2.0, < 4.3.0',
3535
'rdflib-jsonld >= 0.3.0, < 0.5.0',
36-
'html5lib >= 0.90, <= 0.9999999',
3736
'mistune >= 0.7.3, < 0.8',
3837
'typing >= 3.5.2, < 3.6',
3938
'CacheControl >= 0.11.7, < 0.12',

tox.ini

Lines changed: 7 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, py35-mypy, py27-pipconflictchecker
44
skipsdist = True
55

66
[tox:travis]
@@ -38,6 +38,12 @@ commands = flake8 schema_salad 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+
46+
4147
[testenv:py35-unit]
4248
commands = python setup.py test
4349

0 commit comments

Comments
 (0)