Don't run stylecheck on 2.6

4 files changed, 19 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index f56f7ff..2b2d312 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ __pycache__
 docs/_build
 build
 dist
+.cache
diff --git a/.travis.yml b/.travis.yml
index 989c3e9..2f285ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,15 @@
 sudo: false
 os: linux
 language: python
+env:
+    - TOXENV_SUFFIX=test
+    - TOXENV_SUFFIX=stylecheck
 
 matrix:
     include:
         - os: osx
           language: generic
+          env: TOXENV_SUFFIX=test
 
 python:
     - "2.6"
@@ -22,7 +26,9 @@ install:
           brew install python3;
           virtualenv -p python3 $HOME/osx-py3;
           . $HOME/osx-py3/bin/activate;
+          export TRAVIS_PYTHON_VERSION="$(python --version | cut -d ' ' -f 2 | cut -d . -f -2)";
       fi
     - pip install tox
 
-script: tox
+script:
+    - tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d . | sed -e 's/pypypy/pypy/')-$TOXENV_SUFFIX
diff --git a/appveyor.yml b/appveyor.yml
index 4af70fe..a5d47a0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,4 +15,4 @@ install:
   - "%PYTHON%/Scripts/pip.exe install tox"
 
 test_script:
-  - "%PYTHON%/Scripts/tox.exe"
+  - "%PYTHON%/Scripts/tox.exe -e py-test"
diff --git a/tox.ini b/tox.ini
index 644d322..db61843 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,15 @@
-[testenv]
+[tox]
+envlist = py{26,27,py,33,34,35}-{test,stylecheck}
+
+[testenv:test]
 deps =
     pytest
-    flake8
-    flake8-import-order
 commands =
     py.test []
+
+[testenv:stylecheck]
+deps =
     flake8
+    flake8-import-order
+commands =
+    flake8 []