diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-06-11 21:04:38 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-06-14 10:25:31 +0200 |
| commit | 7a23046b280121cfe7c1b8f77eb97c6f099987a7 (patch) | |
| tree | da0bafcb8ad00c9e00a52e7b934882941465941b /doc | |
| parent | 13913023f02ca07a0c737c136c291a4544ef0d24 (diff) | |
| download | kolla-7a23046b280121cfe7c1b8f77eb97c6f099987a7.tar.gz kolla-7a23046b280121cfe7c1b8f77eb97c6f099987a7.zip | |
Fix lower-constraints test fail due to failing dep build
Ubuntu Bionic updated OpenSSL package to new release:
from 1.1.0 to 1.1.1
It caused cryptography in version from lower-constraints
to fail to build in Zuul.
Additionally, constrained cryptography version did not
match the requirement for constrained PyOpenSSL.
This commit bumps the version to the minimum required
by constrained PyOpenSSL.
It works because manylinux1 (binary) wheel exists.
This version agrees also with upper-constraints for Queens.
Dependency on cryptography is removed as it is not used directly
by kolla (and requirements checker requires lower-constraints
matching version - let's not create an illusion of usage).
For stable/stein additionally fix version of sphinx to pass CI.
Change-Id: I8ae19f212049cae5dfb4e8dd6ec6cd14a8c46e0e
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
(cherry picked from commit 39a2cf066c4c79436629017155302d36243aa338)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/requirements.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index 45d011067..0a7848628 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -4,4 +4,5 @@ doc8>=0.6.0 # Apache-2.0 openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 -sphinx!=1.6.6,>=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 |