Skip to content

Commit

Permalink
Merge 406aff9 into 275229c
Browse files Browse the repository at this point in the history
  • Loading branch information
hfaran committed Apr 17, 2019
2 parents 275229c + 406aff9 commit 414e848
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -8,9 +8,9 @@ env:
- TORNADO_VERSION=3.2.2
install:
- "pip install -r requirements.txt"
- "pip install tornado>=$TORNADO_VERSION"
- "pip install pytest"
- "pip install pytest-cov"
- "pip install tornado==$TORNADO_VERSION"
- "pip install 'pytest<4.0'"
- "pip install 'pytest-cov<=2.6'"
- "pip install coverage"
- "pip install coveralls"
- "pip install mock"
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
@@ -1,2 +1,2 @@
tornado>=3.2.2
jsonschema>=2.3.0
tornado>=3.2.2,<6.0
jsonschema>=2.3.0,<3.0
8 changes: 4 additions & 4 deletions tox.ini
Expand Up @@ -3,12 +3,12 @@ envlist = {py27,py36}-tornado{3,4,5}

[testenv]
deps=
pytest
pytest-cov
pytest<4.0
pytest-cov<=2.6
tornado3: tornado==3.2.2
tornado4: tornado==4.5.3
tornado5: tornado>=5.0
jsonschema
tornado5: tornado>=5.0,<6.0
jsonschema>=2.3.0,<3.0

commands=
py.test -vv --cov="tornado_json" --cov-report=term

0 comments on commit 414e848

Please sign in to comment.