diff options
author | Stephen Finucane <stephenfin@redhat.com> | 2022-05-05 18:01:11 +0100 |
---|---|---|
committer | Sahid Orentino Ferdjaoui <sahid.ferdjaoui@industrialdiscipline.com> | 2023-02-06 14:13:57 +0100 |
commit | fa830926b573222d88df2a0a4596fe61da9bafe6 (patch) | |
tree | 43e945628fc10c901d1ad0786871c56f22e91e85 | |
parent | e29b1871518f8a06cc4620f55881ce5d0be0fc76 (diff) | |
download | osprofiler-fa830926b573222d88df2a0a4596fe61da9bafe6.tar.gz |
tox: Add functional-py38, functional-py39 envs
While here, we also clean up some style issues in this file.
Fix CI issue to generated changelog with tox v4
Co-Authored-By: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@industrialdiscipline.com>
Change-Id: If6de005dd8229fe6f21dc103f50db083a415d7e4
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
-rw-r--r-- | .zuul.yaml | 4 | ||||
-rw-r--r-- | doc/source/user/history.rst | 4 | ||||
-rw-r--r-- | setup.cfg | 5 | ||||
-rw-r--r-- | tox.ini | 66 |
4 files changed, 38 insertions, 41 deletions
@@ -9,12 +9,12 @@ - release-notes-jobs-python3 check: jobs: - - openstack-tox-functional-py36 + - openstack-tox-functional-py38 - tempest-smoke-py3-osprofiler-redis - tempest-smoke-py3-osprofiler-sqlalchemy gate: jobs: - - openstack-tox-functional-py36 + - openstack-tox-functional-py38 - job: name: tempest-smoke-py3-osprofiler-redis diff --git a/doc/source/user/history.rst b/doc/source/user/history.rst index f69be70..d111457 100644 --- a/doc/source/user/history.rst +++ b/doc/source/user/history.rst @@ -1 +1,5 @@ +========= +ChangeLog +========= + .. include:: ../../../ChangeLog @@ -6,7 +6,7 @@ description-file = author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/osprofiler/latest/ -python-requires = >=3.6 +python-requires = >=3.8 classifier = Environment :: OpenStack Intended Audience :: Developers @@ -15,9 +15,8 @@ classifier = Operating System :: POSIX :: Linux Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 Programming Language :: Python :: 3 :: Only Programming Language :: Python :: Implementation :: CPython @@ -1,16 +1,14 @@ [tox] minversion = 3.18.0 -# Needed to create ChangeLog for docs building -skipsdist = False envlist = py3,pep8 -ignore_basepython_conflict = True +ignore_basepython_conflict = true [testenv] basepython = python3 -setenv = VIRTUAL_ENV={envdir} - LANG=en_US.UTF-8 - LANGUAGE=en_US:en - LC_ALL=C +setenv = + LANG=en_US.UTF-8 + LANGUAGE=en_US:en + LC_ALL=C deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt @@ -19,19 +17,14 @@ usedevelop = True commands = stestr run --slowest {posargs} distribute = false -[testenv:functional] -setenv = {[testenv]setenv} - OS_TEST_PATH=./osprofiler/tests/functional +[testenv:functional{,-py38,-py39}] +setenv = + {[testenv]setenv} + OS_TEST_PATH=./osprofiler/tests/functional deps = {[testenv]deps} oslo.messaging -[testenv:functional-py36] -basepython = python3.6 -setenv = {[testenv:functional]setenv} -deps = - {[testenv:functional]deps} - [testenv:pep8] commands = pre-commit run -a @@ -44,22 +37,23 @@ commands = {posargs} [testenv:cover] setenv = - PYTHON=coverage run --source osprofiler --parallel-mode + PYTHON=coverage run --source osprofiler --parallel-mode commands = - stestr run {posargs} - coverage combine - coverage html -d cover - coverage xml -o cover/coverage.xml + stestr run {posargs} + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml [testenv:docs] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} - -r{toxinidir}/requirements.txt - -r{toxinidir}/doc/requirements.txt + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt + -r{toxinidir}/doc/requirements.txt allowlist_externals = rm commands = rm -rf doc/build api-guide/build api-ref/build doc/source/contributor/modules sphinx-build -W --keep-going -b html -d doc/build/doctrees doc/source doc/build/html +usedevelop = false [testenv:bandit] commands = bandit -r osprofiler -n5 @@ -76,22 +70,22 @@ application-import-names = osprofiler [flake8:local-plugins] extension = - N301 = checks:check_assert_methods_from_mock - N320 = checks:assert_true_instance - N321 = checks:assert_equal_type - N322 = checks:assert_equal_none - N323 = checks:assert_true_or_false_with_in - N324 = checks:assert_equal_in - N351 = checks:check_no_constructor_data_struct - N352 = checks:check_dict_formatting_in_string - N353 = checks:check_using_unicode - N354 = checks:check_raises + N301 = checks:check_assert_methods_from_mock + N320 = checks:assert_true_instance + N321 = checks:assert_equal_type + N322 = checks:assert_equal_none + N323 = checks:assert_true_or_false_with_in + N324 = checks:assert_equal_in + N351 = checks:check_no_constructor_data_struct + N352 = checks:check_dict_formatting_in_string + N353 = checks:check_using_unicode + N354 = checks:check_raises paths = ./osprofiler/hacking [testenv:releasenotes] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} - -r{toxinidir}/doc/requirements.txt + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/doc/requirements.txt allowlist_externals = rm commands = rm -rf releasenotes/build |