Fix: pin urllib3 < 2.0.0

The newer version of urllib3 break PyPI dependencies.
This patch also changes tox.ini to use requirements file as deps.

Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-4716
Signed-off-by: Ayumu Ueha <ueha.ayumu@jp.fujitsu.com>
Change-Id: Id42e58a684324bd5ef5c578951b2ee6db00696d8

diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index 09a0c1c..ba20050 100644 (file)
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -3,3 +3,4 @@ sphinx-rtd-theme
 sphinxcontrib-httpdomain
 recommonmark
 lfdocs-conf
+urllib3~=1.26.15

diff --git a/tox.ini b/tox.ini
index 9de440b..4994346 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -8,12 +8,7 @@ skipsdist = true
 
 [testenv:docs]
 basepython = python3
-deps =
-    sphinx
-    sphinx-rtd-theme
-    sphinxcontrib-httpdomain
-    recommonmark
-    lfdocs-conf
+deps = -r{toxinidir}/docs/requirements-docs.txt
 
 commands =
     sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
@@ -24,9 +19,6 @@ allowlist_externals = echo
 
 [testenv:docs-linkcheck]
 basepython = python3
-deps = sphinx
-       sphinx-rtd-theme
-       sphinxcontrib-httpdomain
-       recommonmark
-       lfdocs-conf
+deps = -r{toxinidir}/docs/requirements-docs.txt
+
 commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck