diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-03-28 13:18:04 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-03-28 13:18:04 +0100 |
| commit | 81c7eda0b1b243489cd11c1b89b142be02c6e5f2 (patch) | |
| tree | 87180e7d055c85b2ff34cdf1b33d00bf4dc8f1c0 | |
| parent | 8ff7f151266423c3c391f307504a6b7f1edfec6e (diff) | |
Remove tox from test-requirements.txt
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | makefile | 4 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
3 files changed, 4 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 25633b2..a6fa7c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,8 @@ +sudo: false language: python python: - - "2.7" + - "3.5" install: - "make bootstrap" -script: make test-all -notifications: - email: false - + - "pip install 'virtualenv<14.0.0' tox" +script: tox @@ -3,10 +3,6 @@ test: bootstrap _virtualenv/bin/nosetests tests -test-all: - _virtualenv/bin/tox - make clean - upload: jq.c python setup.py sdist upload make clean diff --git a/test-requirements.txt b/test-requirements.txt index 246b984..0798378 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,2 +1 @@ nose>=1.3.0,<2 -tox>=2.0,<3.0 |