summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkihiro Motoki <amotoki@gmail.com>2020-12-09 14:08:36 +0900
committerAkihiro Motoki <amotoki@gmail.com>2020-12-11 00:55:25 +0900
commit019f7ebaf486a87974765534bc6faf30ff7d7130 (patch)
tree4915d5467342864b1ed9a71d5371c508f33a1c08
parent8f8ed624082613b7f249e94afab4e50202b22a1d (diff)
downloadhorizon-019f7ebaf486a87974765534bc6faf30ff7d7130.tar.gz
Cap bandit for python 2.7 env
bandit 1.6.3 supports only python>=3.5 and rokcy jobs with python 2.7 are broken when bandit 1.6.3 is being installed. bandit <1.6.3 supports python 2.7. We have no constraint for test only libraries so we need to cap it. This change is only required in rocky or older releases, so it is directly proposed to stable/rocky. doc/requirements.txt also needs to be updated to pass the requirements-check job as global-requirements.txt in the requirements repo was updated after the rocky release. Depends-On: https://review.opendev.org/c/openstack/requirements/+/766426 Change-Id: Iae6c7abecd1aec9db00c14f29fd98dd1a8682084
-rw-r--r--doc/requirements.txt3
-rw-r--r--test-requirements.txt2
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 71e8cb920..f9b4ae8a9 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -7,7 +7,8 @@
# be installed in a specific order.
openstackdocstheme>=1.18.1 # Apache-2.0
reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx>=1.6.2,!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD
+sphinx>=1.6.2,!=1.6.6,!=1.6.7;python_version>='3.4' # BSD
# The below is rewquired to build testing module reference
mock>=2.0.0 # BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index e94e6e149..49b045d3a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,7 @@
# Hacking should appear first in case something else depends on pep8
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
#
-bandit>=1.4.0 # Apache-2.0
+bandit>=1.4.0,<1.6.3 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
doc8>=0.6.0 # Apache-2.0
flake8-import-order==0.12 # LGPLv3