
oslo.i18n has recently been released. This patch switches marconi over oslo.i18n. As per oslo.i18n's instructions, a new i18n module has been added under marconi. This module defines the translation globals and imports the necessary functions from oslo.i18n. The patch doesn't change the way Marconi does translation, this means that a `_` function is still being injected to the builtins. Note that the gettextutils module is still a required module from oslo-inc because there are oslo-inc modules that depend on the old gettextutils module. Closes-bug: #1314300 Change-Id: Ifb8f3296d1a0e2483ebd1c8d868b7359ecc99fb5
57 lines
1.3 KiB
INI
57 lines
1.3 KiB
INI
[tox]
|
|
minversion = 1.6
|
|
envlist = py26,py27,py33,pypy,pep8,lint2,lint3
|
|
skipsdist = True
|
|
|
|
[testenv]
|
|
usedevelop = True
|
|
# Customize pip command, add -U to force updates.
|
|
install_command = pip install -U {opts} {packages}
|
|
setenv = VIRTUAL_ENV={envdir}
|
|
MARCONI_TESTS_DIR={toxinidir}/tests
|
|
MARCONI_TESTS_CONFIGS_DIR={toxinidir}/tests/etc/
|
|
|
|
deps = -r{toxinidir}/requirements.txt
|
|
-r{toxinidir}/test-requirements.txt
|
|
#commands = nosetests {posargs}
|
|
commands = python setup.py testr --slowest --testr-args='--concurrency 1 {posargs}'
|
|
|
|
[testenv:py33]
|
|
deps = -r{toxinidir}/requirements-py3.txt
|
|
-r{toxinidir}/test-requirements-py3.txt
|
|
|
|
[tox:jenkins]
|
|
downloadcache = ~/cache/pip
|
|
|
|
[testenv:pep8]
|
|
commands = flake8
|
|
|
|
[testenv:lint2]
|
|
basepython = python2
|
|
deps = pylint
|
|
commands = pylint ./marconi ./tests -E --ignore ./openstack
|
|
|
|
[testenv:lint3]
|
|
basepython = python3
|
|
deps = pylint
|
|
commands = pylint ./marconi ./tests -E --ignore ./openstack
|
|
|
|
[testenv:cover]
|
|
setenv = NOSE_WITH_COVERAGE=1
|
|
commands =
|
|
python setup.py testr --coverage \
|
|
--testr-args='^(?!.*test.*coverage).*$'
|
|
|
|
[testenv:venv]
|
|
commands = {posargs}
|
|
|
|
[testenv:docs]
|
|
commands = python setup.py build_sphinx
|
|
|
|
[flake8]
|
|
exclude = .venv*,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*.egg,.update-venv
|
|
|
|
[hacking]
|
|
import_exceptions = marconi.openstack.common.gettextutils._,marconi.i18n._
|
|
|