Merge "tox: Set 'ignore_basepython_conflict'"

tox.ini

@@ -2,13 +2,15 @@
 minversion = 2.0
 envlist = py38,pep8
 skipdist = True
+ignore_basepython_conflict = true
 
 [testenv]
 basepython = python3
 usedevelop = True
-setenv = OS_STDOUT_CAPTURE=1
-         OS_STDERR_CAPTURE=1
-         OS_TEST_TIMEOUT=60
+setenv =
+  OS_STDOUT_CAPTURE=1
+  OS_STDERR_CAPTURE=1
+  OS_TEST_TIMEOUT=60
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
@@ -18,11 +20,11 @@ whitelist_externals = stestr
 
 [testenv:unit-tips]
 commands =
-    python -m pip install -q -e "git+file://{toxinidir}/../cliff#egg=cliff"
-    python -m pip install -q -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth"
-    python -m pip install -q -e "git+file://{toxinidir}/../openstacksdk#egg=openstacksdk"
-    python -m pip freeze
-    stestr run {posargs}
+  python -m pip install -q -e "git+file://{toxinidir}/../cliff#egg=cliff"
+  python -m pip install -q -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth"
+  python -m pip install -q -e "git+file://{toxinidir}/../openstacksdk#egg=openstacksdk"
+  python -m pip freeze
+  stestr run {posargs}
 whitelist_externals = stestr
 
 [testenv:pep8]
@@ -33,8 +35,8 @@ commands = {posargs}
 
 [testenv:cover]
 commands =
-    python setup.py test --coverage --coverage-package-name=osc_lib --testr-args='{posargs}'
-    coverage report
+  python setup.py test --coverage --coverage-package-name=osc_lib --testr-args='{posargs}'
+  coverage report
 
 [testenv:debug]
 commands = oslo_debug_helper -t osc_lib/tests {posargs}
@@ -44,10 +46,10 @@ deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
 commands =
-    sphinx-apidoc -o doc/api osc_lib osc_lib/tests
-    # Create ChangeLog file
-    python setup.py sdist
-    sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
+  sphinx-apidoc -o doc/api osc_lib osc_lib/tests
+  # Create ChangeLog file
+  python setup.py sdist
+  sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
 
 [testenv:releasenotes]
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html