From 21382fb18a92b56fa13997aa9642869c2f3e810f Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 22 Dec 2022 14:04:25 -0800 Subject: [PATCH] Switch to nox Like Zuul, replace our usage of tox with nox. Change-Id: I501fb8a25872072727a24f3cd741fd54808495ed --- .zuul.yaml | 26 +++++++------- noxfile.py | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ setup.cfg | 7 ++++ tox.ini | 7 ---- 4 files changed, 119 insertions(+), 20 deletions(-) create mode 100644 noxfile.py diff --git a/.zuul.yaml b/.zuul.yaml index 5142bb6..b241f1f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -63,32 +63,32 @@ release_python: python3 check: jobs: - - zuul-tox-docs + - zuul-nox-docs - zuul-client-build-image - - tox-linters: + - nox-linters: vars: - tox_install_bindep: false - - tox-py38: + nox_install_bindep: false + - nox-py38: nodeset: ubuntu-focal timeout: 3600 - - tox-py310: + - nox-py310: nodeset: ubuntu-jammy timeout: 3600 - - zuul-tox-zuul-client + - zuul-nox-zuul-client - build-python-release gate: jobs: - - zuul-tox-docs - - tox-linters: + - zuul-nox-docs + - nox-linters: vars: - tox_install_bindep: false - - tox-py38: + nox_install_bindep: false + - nox-py38: nodeset: ubuntu-focal timeout: 3600 - - tox-py310: + - nox-py310: nodeset: ubuntu-jammy timeout: 3600 - - zuul-tox-zuul-client + - zuul-nox-zuul-client - build-python-release - zuul-client-upload-image promote: @@ -99,7 +99,7 @@ release: jobs: - opendev-release-python - - zuul-publish-tox-docs + - zuul-publish-nox-docs - upload-docker-image: secrets: name: docker_credentials diff --git a/noxfile.py b/noxfile.py new file mode 100644 index 0000000..523012e --- /dev/null +++ b/noxfile.py @@ -0,0 +1,99 @@ +# Copyright 2022 Acme Gating, LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import multiprocessing +import os + +import nox + + +nox.options.error_on_external_run = True +nox.options.reuse_existing_virtualenvs = True +nox.options.sessions = ["tests-3", "linters"] + + +def set_env(session, var, default): + session.env[var] = os.environ.get(var, default) + + +def set_standard_env_vars(session): + set_env(session, 'OS_LOG_CAPTURE', '1') + set_env(session, 'OS_STDERR_CAPTURE', '1') + set_env(session, 'OS_STDOUT_CAPTURE', '1') + set_env(session, 'OS_TEST_TIMEOUT', '360') + set_env(session, 'SQLALCHEMY_WARN_20', '1') + session.env['PYTHONWARNINGS'] = ','.join([ + 'always::DeprecationWarning:zuul.driver.sql.sqlconnection', + 'always::DeprecationWarning:tests.base', + 'always::DeprecationWarning:tests.unit.test_database', + 'always::DeprecationWarning:zuul.driver.sql.alembic.env', + 'always::DeprecationWarning:zuul.driver.sql.alembic.script', + ]) + + +@nox.session(python='3') +def bindep(session): + set_standard_env_vars(session) + session.install('bindep') + session.run('bindep', 'test') + + +@nox.session(python='3') +def cover(session): + set_standard_env_vars(session) + session.env['PYTHON'] = 'coverage run --source zuulclient --parallel-mode' + session.install('-r', 'requirements.txt', + '-r', 'test-requirements.txt') + session.install('-e', '.') + session.run('stestr', 'run') + session.run('coverage', 'combine') + session.run('coverage', 'html', '-d', 'cover') + session.run('coverage', 'xml', '-o', 'cover/coverage.xml') + + +@nox.session(python='3') +def docs(session): + set_standard_env_vars(session) + session.install('-r', 'doc/requirements.txt', + '-r', 'test-requirements.txt') + session.install('-e', '.') + session.run('sphinx-build', '-E', '-W', '-d', 'doc/build/doctrees', + '-b', 'html', 'doc/source/', 'doc/build/html') + + +@nox.session(python='3') +def linters(session): + set_standard_env_vars(session) + session.install('flake8') + session.run('flake8') + + +@nox.session(python='3') +def tests(session): + set_standard_env_vars(session) + session.install('-r', 'requirements.txt', + '-r', 'test-requirements.txt') + session.install('-e', '.') + procs = max(int(multiprocessing.cpu_count() / 2), 1) + session.run('stestr', 'run', '--slowest', f'--concurrency={procs}', + *session.posargs) + + +@nox.session(python='3') +def venv(session): + set_standard_env_vars(session) + session.install('-r', 'requirements.txt', + '-r', 'test-requirements.txt') + session.install('-e', '.') + session.run() diff --git a/setup.cfg b/setup.cfg index 7dbd49d..320979f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -54,3 +54,10 @@ source-dir = doc/source build-dir = doc/build all_files = 1 warning-is-error = 1 + +[flake8] +# These are ignored intentionally in zuul projects; +# please don't submit patches that solely correct them or enable them. +ignore = E124,E125,E129,E252,E402,E741,H,W503,W504 +show-source = True +exclude = .venv,.tox,.nox,dist,doc,build,*.egg,node_modules diff --git a/tox.ini b/tox.ini index 6b129f7..b1888b3 100644 --- a/tox.ini +++ b/tox.ini @@ -66,10 +66,3 @@ commands = [testenv:venv] commands = {posargs} - -[flake8] -# These are ignored intentionally in zuul projects; -# please don't submit patches that solely correct them or enable them. -ignore = E124,E125,E129,E252,E402,E741,H,W503,W504 -show-source = True -exclude = .venv,.tox,dist,doc,build,*.egg,node_modules