Update tox.ini for multiple python versions

DankCity · Feb 29, 2016 · 23d7675 · 23d7675
1 parent 05f40e9
commit 23d7675
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/circle.yml b/circle.yml
@@ -1,6 +1,8 @@
 machine:
   python:
     version: 3.5.0
+  environment:
+    PY_VERSIONS: '2.7.10 3.3.3 3.4.3 3.5.0 pypy-2.5.0'
 
 general:
   artifacts:
@@ -12,7 +14,8 @@ dependencies:
   override:
     - pip install --upgrade pip
     - pip install --upgrade tox
-    - pip install --upgrade python-coveralls
+    - pip install --upgrade coveralls
+    - pyenv local $PY_VERSIONS
 
 test:
   override:

diff --git a/tox.ini b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 skipdist = True
-envlist = test
+envlist = py27, py33, py34, py35, pypy
 
 [testenv]
-basepython = python3.5
 envdir = {toxworkdir}/tox
+passenv = CIRCLE_BRANCH
 deps =
     pytest>=2.6.4
     pytest-cov>=1.8.1
@@ -13,8 +13,6 @@ deps =
     isort
     tox-pyenv
 
-
-[testenv:test]
 commands =
     py.test --cov dankbot --cov-report term-missing --cov-report html --cov-report xml --junitxml={envdir}/junit.xml []
     flake8 --statistics --count --max-complexity=10 --max-line-length=100 --output-file={envdir}/flake8.txt setup.py dankbot tests