openstack
/
osc-lib
Code Issues Proposed changes

tox: Set 'ignore_basepython_conflict' 

Resolves the following warning:

  /usr/lib/python3.7/site-packages/tox/config/__init__.py:578:
  UserWarning: conflicting basepython version (set 37, should be 36) for
  env 'py36'; resolve conflict or set ignore_basepython_conflict

While here, also fix indentation of this file.

Change-Id: I48bf44cf7237554a48180c8bd3537425f0401f30
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2020-11-04 15:20:55 +00:00
parent 4bb55ce75d
commit ce3e3783f1
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tox.ini
View File

@ -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