From 23d767532616f434e70aa6b97130cd0a905b2db6 Mon Sep 17 00:00:00 2001 From: levi-rs Date: Mon, 29 Feb 2016 12:09:33 -0600 Subject: [PATCH] Update tox.ini for multiple python versions --- circle.yml | 5 ++++- tox.ini | 6 ++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index 9595363..d9d4fe6 100644 --- 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 index 137964b..53f1984 100644 --- 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