rework travis and tox setup

Gauvain Pocentek · Gauvain Pocentek · commit 3371e0e1281a · 2016-09-29T21:34:20.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,23 @@
 sudo: required
 services:
   - docker
-
+addons:
+  apt:
+    sources:
+      - deadsnakes
+    packages:
+      - python3.5
 language: python
 python: 2.7
 env:
+  - TOX_ENV=py35
   - TOX_ENV=py34
   - TOX_ENV=py27
   - TOX_ENV=pep8
   - TOX_ENV=docs
-  - TOX_ENV=noop_py
-  - TOX_ENV=noop_cli
+  - TOX_ENV=py_func
+  - TOX_ENV=cli_func
 install:
   - pip install tox
 script:
   - tox -e $TOX_ENV
-after_success:
-  if [ "$TOX_ENV" = "noop_py" ]; then ./tools/py_functional_tests.sh; elif [ "$TOX_ENV" = "noop_cli" ]; then ./tools/functional_tests.sh; fi
diff --git a/tox.ini b/tox.ini
@@ -32,12 +32,8 @@ commands = python setup.py build_sphinx
 commands =
    python setup.py testr --slowest --coverage --testr-args="{posargs}"
 
-[testenv:noop_cli]
-usedevelop = True
-install_command = true {opts} {packages}
-commands = true
+[testenv:cli_func]
+commands = {toxinidir}/tools/functional_tests.sh
 
-[testenv:noop_py]
-usedevelop = True
-install_command = true {opts} {packages}
-commands = true
+[testenv:py_func]
+commands = {toxinidir}/tools/py_functional_tests.sh
