summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Ceratto <federico.ceratto@gmail.com>2016-02-20 15:04:48 +0000
committerFederico Ceratto <federico.ceratto@gmail.com>2016-02-20 15:17:55 +0000
commit8ccd491d1b0300bc9bf0fef7ace508afc13d37e8 (patch)
tree900187f0956838cc660a0885c11e0359fbd25210
parentf07411c23acbefa4e7347d5b458c31b91947a207 (diff)
downloadcmd2-git-8ccd491d1b0300bc9bf0fef7ace508afc13d37e8.tar.gz
Update Tox, add TravisCI support
-rw-r--r--.travis.yml11
-rw-r--r--tox.ini4
2 files changed, 13 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..826fddbb
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+language: python
+env:
+ - TOXENV=py27
+ - TOXENV=py33
+ - TOXENV=py34
+ # - TOXENV=py35 https://github.com/travis-ci/travis-ci/issues/4794
+ - TOXENV=pypy
+install:
+ - pip install tox
+script:
+ - tox
diff --git a/tox.ini b/tox.ini
index fa877baf..2801d30c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
[tox]
-envlist = py25,py26,py27,py31,py33,jython
+envlist = py27,py34,py35,jython,pypy
[testenv]
deps=pyparsing
commands=
{envpython} cmd2.py
- {envpython} example/example.py --test example/exampleSession.txt \ No newline at end of file
+ {envpython} example/example.py --test example/exampleSession.txt