From 760583c739c2d1884abcaffdafb467cb889007bc Mon Sep 17 00:00:00 2001 From: Ian McDonald Date: Mon, 23 Jan 2023 15:24:50 -0800 Subject: [PATCH] Update to newer version of tox (#376) * Update to newer version of tox * ignore virtualenvs in style * add virtualenvs to ignore * use sphinx 1.6 --- .gitignore | 1 + docs/requirements.txt | 2 +- tox.ini | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a9d948bdc..abda83a65 100644 --- a/.gitignore +++ b/.gitignore @@ -97,6 +97,7 @@ venv/ ENV/ env.bak/ venv.bak/ +.virtualenvs/ # Spyder project settings .spyderproject diff --git a/docs/requirements.txt b/docs/requirements.txt index bb1cf98d2..a6257c2ad 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,4 @@ -Sphinx==1.5.3 +Sphinx<1.7 sphinx-argparse==0.1.17 sphinx-rtd-theme==0.2.4 boto3==1.9.0 diff --git a/tox.ini b/tox.ini index 09d1b0ee3..aff499ea2 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ setenv = PIP_PROCESS_DEPENDENCY_LINKS=1 PIP_DEFAULT_TIMEOUT=60 ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future -envdir = {homedir}/.virtualenvs/ducktape_{envname} +envdir = {package_root}/.virtualenvs/ducktape_{envname} commands = pytest {env:PYTESTARGS:} {posargs} @@ -24,20 +24,20 @@ commands = envdir = {homedir}/.virtualenvs/ducktape-py2 [testenv:py36] -envdir = {homedir}/.virtualenvs/ducktape-py36 +envdir = {package_root}/.virtualenvs/ducktape-py36 [testenv:py37] -envdir = {homedir}/.virtualenvs/ducktape-py37 +envdir = {package_root}/.virtualenvs/ducktape-py37 [testenv:style] basepython = python3.7 -envdir = {homedir}/.virtualenvs/ducktape +envdir = {package_root}/.virtualenvs/ducktape commands = flake8 --config tox.ini [testenv:cover] basepython = python3.7 -envdir = {homedir}/.virtualenvs/ducktape +envdir = {package_root}/.virtualenvs/ducktape commands = pytest {env:PYTESTARGS:} --cov ducktape --cov-report=xml --cov-report=html --cov-report=term --cov-report=annotate:textcov \ --cov-fail-under=70 @@ -51,6 +51,6 @@ commands = sphinx-build -M {env:SPHINX_BUILDER:html} . _build {posargs} [flake8] -exclude = .git,.tox,.eggs,__pycache__,docs,build,dist +exclude = .git,.tox,.eggs,__pycache__,docs,build,dist,.virtualenvs ignore = E111,E121,W292,E123,E226,W503 max-line-length = 120