diff options
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | tox.ini | 26 |
2 files changed, 32 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index b89e5d8..8124e88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,19 +3,23 @@ language: python matrix: include: - python: 2.6 - env: TOXENV=py26 + env: TOXENV=python2.6 - python: 2.7 - env: TOXENV=py27 + env: TOXENV=python2.7 - python: 3.3 - env: TOXENV=py33 + env: TOXENV=python3.3 - python: 3.4 - env: TOXENV=py34 + env: TOXENV=python3.4 - python: 3.5 - env: TOXENV=py35 + env: TOXENV=python3.5 - python: pypy env: TOXENV=pypy - python: pypy3 env: TOXENV=pypy3 + - python: 3.5 + env: TOXENV=crosspython3 + - python: 2.7 + env: TOXENV=crosspython2 - python: 2.7 env: TOXENV=docs @@ -1,14 +1,34 @@ [tox] +# env names must be a valid python binary name, unless they have a +# separate configuration envlist = - py26, py27, py32, py33, py34, py35, pypy, pypy3, docs + python{2.6,2.7,3.3,3.4,3.5}, pypy{,3}, crosspython{2,3}, docs [testenv] deps = mock pytest commands = - py.test [] - python virtualenv.py {envtmpdir}/test-venv-01 + py.test + python virtualenv.py {envtmpdir}/venv + python virtualenv.py -p {envname} {envtmpdir}/{envname} + python virtualenv.py --python={envpython} {envtmpdir}/{envname}-fullpath + +# Creating a python3 venv with a python2-based virtualenv +[testenv:crosspython2] +basepython=python2 +deps = +commands = + virtualenv -p python3 {envtmpdir}/{envname} + {envtmpdir}/{envname}/bin/python -V 2>&1 | grep "Python 3" + +# Creating a python2 venv with a python3-based virtualenv +[testenv:crosspython3] +basepython=python3 +deps = +commands = + virtualenv -p python2 {envtmpdir}/{envname} + {envtmpdir}/{envname}/bin/python -V 2>&1 | grep "Python 2" [testenv:docs] deps = |