Skip to content

Commit a7305a6

Browse files
committed
Merge remote-tracking branch 'legoktm/tox' into develop
* legoktm/tox: Use tox to run tests
2 parents 5cc622c + d14cf96 commit a7305a6

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
language: python
22
python: "2.7"
3-
install: pip install jsonschema
4-
script: bin/jsonschema_suite check
3+
install: pip install tox
4+
script: tox

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,5 +144,5 @@ Contributing
144144
If you see something missing or incorrect, a pull request is most welcome!
145145

146146
There are some sanity checks in place for testing the test suite. You can run
147-
them with `bin/jsonschema_suite check`. They will be run automatically by
147+
them with `bin/jsonschema_suite check` or `tox`. They will be run automatically by
148148
[Travis CI](https://travis-ci.org/) as well.

tox.ini

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[tox]
2+
minversion = 1.6
3+
skipsdist = True
4+
envlist = py27
5+
6+
[testenv]
7+
commands = python bin/jsonschema_suite check
8+
deps = jsonschema

0 commit comments

Comments
 (0)