diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2019-05-09 16:47:41 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2019-05-16 14:07:09 -0500 |
| commit | b507f605e46b2df3253de528ff8551ee5706689d (patch) | |
| tree | 907c2d3b727a683bee6bf1155e2268b696bff2d7 | |
| parent | 97da13dbc3c8447c93a0f0e1749fb4b840837e90 (diff) | |
| download | python-openstackclient-b507f605e46b2df3253de528ff8551ee5706689d.tar.gz | |
Stable branch combination fix
We have two dueling problems in the stable branches that have to be
fixed at the same time:
* bandit 1.6.0
* sphinx 2.0
This is a squash of the two cherry-picks from master:
----------
Blacklist Bandit 1.6.0 due to directory exclusion bug
Bandit 1.6.0 introduces a regression[0] with the -x option, a fix
is expected to be included in 1.6.1 soon.
[0] https://github.com/PyCQA/bandit/issues/488
[1] https://github.com/PyCQA/bandit/pull/489
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
(cherry picked from commit 6385d64237c9973dd4c7dd53efb6664ea2c719da)
----------
Update sphinx requirement.
Sphinx 2.0 no longer works on python 2.7, start cappingit there as well.
(cherry picked from commit f1791179768115b6d074f70f9a8695f9c1e0b9f5)
Change-Id: I0076645d9e1a2429efce39f51ceea679fa6c13cb
| -rw-r--r-- | doc/requirements.txt | 3 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index 1afc73d6..5d952186 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,5 +3,6 @@ # process, which may cause wedges in the gate later. openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4' # BSD sphinxcontrib-apidoc>=0.2.0 # BSD diff --git a/test-requirements.txt b/test-requirements.txt index 8ec69331..4cb66cfd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -16,7 +16,7 @@ stestr>=1.0.0 # Apache-2.0 testtools>=2.2.0 # MIT tempest>=17.1.0 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0 -bandit>=1.1.0 # Apache-2.0 +bandit!=1.6.0,>=1.1.0 # Apache-2.0 wrapt>=1.7.0 # BSD License # Install these to generate sphinx autodocs |