x/apmec-horizon
Code Issues Proposed changes

fix tox python3 overrides

Browse Source 
We want to default to running all tox environments under python 3, so
set the basepython value in each environment.

We do not want to specify a minor version number, because we do not
want to have to update the file every time we upgrade python.

We do not want to set the override once in testenv, because that
breaks the more specific versions used in default environments like
py35 and py36.

Change-Id: I5ed6fb582e14853e8908c3fb82d5061591ac7bbf
This commit is contained in:
huang.zhiping 2018-06-08 14:18:02 +08:00 committed by Alessandro Nesta
parent 1d82401bd2
commit a6356e7fba
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tox.ini
View File

@ -1,10 +1,9 @@
[tox] [tox]
envlist = py27,pep8 envlist = py27,py35,pep8
minversion = 1.6 minversion = 1.6
skipsdist = True skipsdist = True
[testenv] [testenv]
basepython=python2.7
usedevelop = True usedevelop = True
install_command = pip install -U {opts} {packages} install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
@ -21,12 +20,14 @@ commands =
{envpython} {toxinidir}/manage.py test apmec_horizon --settings=apmec_horizon.test.settings {posargs} {envpython} {toxinidir}/manage.py test apmec_horizon --settings=apmec_horizon.test.settings {posargs}
[testenv:py27] [testenv:py27]
basepython=python2.7
commands = commands =
{envpython} {toxinidir}/manage.py test apmec_horizon --settings=apmec_horizon.test.settings {posargs} {envpython} {toxinidir}/manage.py test apmec_horizon --settings=apmec_horizon.test.settings {posargs}
[tox:jenkins] [tox:jenkins]
[testenv:pep8] [testenv:pep8]
basepython=python3
usedevelop = True usedevelop = True
whitelist_externals = whitelist_externals =
git git
@ -37,13 +38,16 @@ commands =
flake8 flake8
[testenv:doc] [testenv:doc]
basepython=python3
deps = Sphinx deps = Sphinx
commands = sphinx-build doc/source doc/build commands = sphinx-build doc/source doc/build
[testenv:cover] [testenv:cover]
basepython=python3
setenv = NOSE_WITH_COVERAGE=1 setenv = NOSE_WITH_COVERAGE=1
[testenv:venv] [testenv:venv]
basepython=python3
commands = {posargs} commands = {posargs}
[flake8] [flake8]
@ -51,6 +55,7 @@ show-source = True
max-complexity = 20 max-complexity = 20
[testenv:makemessages] [testenv:makemessages]
basepython=python3
commands = commands =
pybabel extract -F babel-django.cfg -o apmec_horizon/locale/django.pot -k gettext_noop -k gettext_lazy -k ngettext_lazy:1,2 -k ugettext_noop -k ugettext_lazy -k ungettext_lazy:1,2 -k npgettext:1c,2,3 -k pgettext_lazy:1c,2 -k npgettext_lazy:1c,2,3 apmec_horizon pybabel extract -F babel-django.cfg -o apmec_horizon/locale/django.pot -k gettext_noop -k gettext_lazy -k ngettext_lazy:1,2 -k ugettext_noop -k ugettext_lazy -k ungettext_lazy:1,2 -k npgettext:1c,2,3 -k pgettext_lazy:1c,2 -k npgettext_lazy:1c,2,3 apmec_horizon
pybabel extract -F babel-djangojs.cfg -o apmec_horizon/locale/djangojs.pot -k gettext_noop -k gettext_lazy -k ngettext_lazy:1,2 -k ugettext_noop -k ugettext_lazy -k ungettext_lazy:1,2 -k npgettext:1c,2,3 -k pgettext_lazy:1c,2 -k npgettext_lazy:1c,2,3 apmec_horizon pybabel extract -F babel-djangojs.cfg -o apmec_horizon/locale/djangojs.pot -k gettext_noop -k gettext_lazy -k ngettext_lazy:1,2 -k ugettext_noop -k ugettext_lazy -k ungettext_lazy:1,2 -k npgettext:1c,2,3 -k pgettext_lazy:1c,2 -k npgettext_lazy:1c,2,3 apmec_horizon