Merge branch '0.11.x'

confluentinc · Jan 23, 2023 · 64c99d6 · 64c99d6
2 parents 7dce141 + dca0686
commit 64c99d6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -1,4 +1,4 @@
-Sphinx==1.5.3
+Sphinx<1.7
 sphinx-argparse==0.1.17
 sphinx-rtd-theme==0.2.4
 boto3==1.15.9

diff --git a/tox.ini b/tox.ini
@@ -16,28 +16,28 @@ 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}
 
 [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:py38]
 envdir = {homedir}/.virtualenvs/ducktape-py38
 
 [testenv:style]
 basepython = python3.8
-envdir = {homedir}/.virtualenvs/ducktape
+envdir = {package_root}/.virtualenvs/ducktape
 commands =
     flake8 --config tox.ini
 
 [testenv:cover]
 basepython = python3.8
-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