summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--oslo_i18n/tests/utils.py2
-rw-r--r--tox.ini5
2 files changed, 5 insertions, 2 deletions
diff --git a/oslo_i18n/tests/utils.py b/oslo_i18n/tests/utils.py
index a6ad6c3..be1d94b 100644
--- a/oslo_i18n/tests/utils.py
+++ b/oslo_i18n/tests/utils.py
@@ -36,7 +36,7 @@ class NoDeepCopyObject(object):
return str(self.value)
else:
def __unicode__(self):
- return unicode(self.value)
+ return six.text_type(self.value)
def __deepcopy__(self, memo):
raise TypeError('Deep Copy not supported')
diff --git a/tox.ini b/tox.ini
index e986b56..262fd42 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,7 @@ minversion = 2.0
envlist = py35,py27,pep8
[testenv]
+basepython = python3
install_command = pip install {opts} {packages}
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
@@ -10,6 +11,9 @@ deps =
-r{toxinidir}/requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}'
+[testenv:py27]
+basepython = python2.7
+
[testenv:pep8]
deps =
-r{toxinidir}/test-requirements.txt
@@ -54,7 +58,6 @@ commands = pip-missing-reqs -d --ignore-module=oslo_i18n* --ignore-file=oslo_i18
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:lower-constraints]
-basepython = python3
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt