summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElod Illes <elod.illes@est.tech>2021-02-26 23:29:50 +0100
committerElod Illes <elod.illes@est.tech>2021-03-01 16:22:12 +0100
commitb38b0cae1f95461e128b5ca6c6f7a2a447843e0e (patch)
tree80a4834394a6461fdd61fb7cfbdbf8ed8ccf6538
parent38c374bcb35b74469ea9363455a2ae2d09738e0f (diff)
downloadoslo-rootwrap-stable/stein.tar.gz
[stable-only] Cap bandit and fix lower-constraintsstable/stein
The 1.6.3 [1] release has dropped support for py2 [2] but the release is faulty and pip still picks it up for py2 [3][4], so cap to 1.6.2 when using py2. Sphinx requirements also fixed to make requirements-check job pass. [1] https://github.com/PyCQA/bandit/releases/tag/1.6.3 [2] https://github.com/PyCQA/bandit/pull/615 [3] https://github.com/PyCQA/bandit/issues/663 [4] https://github.com/PyCQA/bandit/issues/665 Change-Id: Ib53ba3d18179fd773ace2fc26479b60ecd4c820c
-rw-r--r--doc/requirements.txt3
-rw-r--r--test-requirements.txt6
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 03ec55f..5767759 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -3,7 +3,8 @@
# process, which may cause wedges in the gate later.
# These are needed for docs generation
openstackdocstheme>=1.18.1 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
reno>=2.5.0 # Apache-2.0
mock>=2.0.0 # BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index ed60fb1..fb773ef 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,8 @@ testtools>=2.2.0 # MIT
stestr>=2.0.0 # Apache-2.0
# this is required for the docs build jobs
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0
@@ -23,4 +24,5 @@ eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
reno>=2.5.0 # Apache-2.0
# Bandit security code scanner
-bandit>=1.1.0 # Apache-2.0
+bandit>=1.1.0,<1.6.3;python_version=='2.7' # Apache-2.0
+bandit>=1.1.0;python_version>='3.5' # Apache-2.0