diff options
author | Zuul <zuul@review.opendev.org> | 2019-06-11 08:48:46 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-06-11 08:48:46 +0000 |
commit | 4a76ab11d1c3fbc5d7ec9608b21f1cd3256d308b (patch) | |
tree | 7efd2387d208a9103e0c783de9f5a05014fba2f6 | |
parent | 628870965778d8e884a1370b317fc485968950f6 (diff) | |
parent | 5dff1692a005e868ca48045838aa921311a360b7 (diff) | |
download | oslo-serialization-4a76ab11d1c3fbc5d7ec9608b21f1cd3256d308b.tar.gz |
Merge "Resolve some issue with tox.ini, setup.cfg"
-rw-r--r-- | setup.cfg | 12 | ||||
-rw-r--r-- | tox.ini | 42 |
2 files changed, 19 insertions, 35 deletions
@@ -17,20 +17,12 @@ classifier = Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 [files] packages = oslo_serialization -[build_sphinx] -all-files = 1 -warning-is-error = 1 -source-dir = doc/source -build-dir = doc/build - -[upload_sphinx] -upload-dir = doc/build/html - [compile_catalog] directory = oslo.serialization/locale domain = oslo.serialization @@ -45,5 +37,5 @@ keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg output_file = oslo.serialization/locale/oslo.serialization.pot -[wheel] +[bdist_wheel] universal = 1 @@ -1,55 +1,47 @@ [tox] -minversion = 2.0 -envlist = py36,py27,pep8 +minversion = 3.1 +envlist = py27,py36,py37,pep8 +basepython = python3 +ignore_basepython_conflict = True [testenv] install_command = pip install {opts} {packages} deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt commands = stestr run --slowest {posargs} -[testenv:py27] -basepython = python2.7 - [testenv:pep8] -basepython = python3 -deps = - -r{toxinidir}/test-requirements.txt commands = flake8 # Run security linter bandit -r oslo_serialization tests -n5 [testenv:venv] -basepython = python3 commands = {posargs} -[testenv:docs] -basepython = python3 -deps = -r{toxinidir}/doc/requirements.txt -commands = sphinx-build -W -b html doc/source doc/build/html - [testenv:cover] -basepython = python3 commands = python setup.py test --coverage --coverage-package-name=oslo_serialization --testr-args='{posargs}' -[flake8] -# E123, E125 skipped as they are invalid PEP-8. - -show-source = True -ignore = E123,E125 -exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build +[testenv:docs] +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -r{toxinidir}/doc/requirements.txt +commands = sphinx-build -W -b html doc/source doc/build/html [testenv:releasenotes] -basepython = python3 -deps = -r{toxinidir}/doc/requirements.txt +deps = {[testenv:docs]deps} 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 -r{toxinidir}/requirements.txt + +[flake8] +# E123, E125 skipped as they are invalid PEP-8. +show-source = True +ignore = E123,E125 +exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build |