Merge "Add support for Python 3.5"
This commit is contained in:
commit
4478987fbd
@ -17,6 +17,7 @@ classifier =
|
||||
Programming Language :: Python :: 2.7
|
||||
Programming Language :: Python :: 3
|
||||
Programming Language :: Python :: 3.4
|
||||
Programming Language :: Python :: 3.5
|
||||
|
||||
[files]
|
||||
packages =
|
||||
|
18
tox.ini
18
tox.ini
@ -1,5 +1,5 @@
|
||||
[tox]
|
||||
envlist = docs,py34,py27,pep8
|
||||
envlist = docs,py35,py34,py27,pep8
|
||||
minversion = 2.3.1
|
||||
skipsdist = True
|
||||
|
||||
@ -48,6 +48,12 @@ setenv = {[testenv:functional]setenv}
|
||||
deps =
|
||||
{[testenv:functional]deps}
|
||||
|
||||
[testenv:functional-py35]
|
||||
basepython = python3.5
|
||||
setenv = {[testenv:functional]setenv}
|
||||
deps =
|
||||
{[testenv:functional]deps}
|
||||
|
||||
[testenv:dsvm-functional]
|
||||
basepython = python2.7
|
||||
setenv = {[testenv:functional]setenv}
|
||||
@ -69,6 +75,16 @@ commands =
|
||||
{toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
|
||||
{toxinidir}/tools/ostestr_compat_shim.sh {posargs}
|
||||
|
||||
[testenv:dsvm-functional-py35]
|
||||
basepython = python3.5
|
||||
setenv = {[testenv:dsvm-functional]setenv}
|
||||
sitepackages={[testenv:dsvm-functional]sitepackages}
|
||||
deps =
|
||||
{[testenv:dsvm-functional]deps}
|
||||
commands =
|
||||
{toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
|
||||
{toxinidir}/tools/ostestr_compat_shim.sh {posargs}
|
||||
|
||||
[testenv:dsvm-fullstack]
|
||||
setenv = {[testenv]setenv}
|
||||
{[testenv:common]setenv}
|
||||
|
Loading…
Reference in New Issue
Block a user