Preinstall requirements for docs build and fix lower constraints
Sphinx installs the package with its dependencies, but it does not use
the constraints. This can lead to errors if a dependency introduces any
backward incompatible changes. To avoid this the dependencies needs to
be installed prior to sphinx run by tox with the correct constraints.
Conflicts:
tox.ini
NOTE(elod.illes):
* conflict is due to branch specific upper constraints setting patch.
* this patch also corrects the contradicting lower constraints to make
the lower-constraints job pass (with the new pip dependency resolver,
introduced in pip 20.3, the job started to show the contradictions
and thus started to fail):
- hacking >= 3.0 is required according to test-requirements.txt
- mccabe 0.6.0 and pyflakes 2.0.0 is required by flake 3.6.0, which
is required by hacking 3.0.0
- MarkupSafe 1.1 is required by some not so old setuptools (this is
not required in zuul gate, but fails locally usually)
- warlock 1.3.0 is disallowed by python-glanceclient
* requirements-check job fails with error at bindep install:
No package matching 'python-guestfs' is available
and the job runs on ubuntu-focal node. This patch changes the nodeset
to ubuntu-bionic where 'python-guestfs' still exists.
Change-Id: I4ba83f1007dd11801b8e32c6d7566769e005480b
(cherry picked from commit e0136189fc)
(cherry picked from commit 0900fc028c)
(cherry picked from commit 44ac39ad4d)
This commit is contained in:
Elod Illes
parent
57fd4a1137
commit
699744e863
|
|
@ -4,7 +4,6 @@
|
|||
- openstack-python3-ussuri-jobs
|
||||
- periodic-stable-jobs
|
||||
- publish-openstack-docs-pti
|
||||
- check-requirements
|
||||
- release-notes-jobs-python3
|
||||
check:
|
||||
jobs:
|
||||
|
|
@ -16,6 +15,8 @@
|
|||
- sahara-tests-tempest-v2
|
||||
- openstack-tox-cover:
|
||||
voting: false
|
||||
- requirements-check:
|
||||
nodeset: ubuntu-bionic
|
||||
- sahara-grenade
|
||||
- sahara-openstack-ansible-functional
|
||||
gate:
|
||||
|
|
@ -25,6 +26,8 @@
|
|||
- sahara-tests-scenario-v2
|
||||
- sahara-tests-tempest
|
||||
- sahara-tests-tempest-v2
|
||||
- requirements-check:
|
||||
nodeset: ubuntu-bionic
|
||||
- sahara-grenade
|
||||
- sahara-openstack-ansible-functional
|
||||
experimental:
|
||||
|
|
|
|||
|
|
@ -32,14 +32,14 @@ eventlet==0.18.2
|
|||
extras==1.0.0
|
||||
fasteners==0.14.1
|
||||
fixtures==3.0.0
|
||||
flake8==2.6.2
|
||||
flake8==3.6.0
|
||||
Flask==1.0.2
|
||||
future==0.16.0
|
||||
futurist==1.6.0
|
||||
gitdb2==2.0.3
|
||||
GitPython==2.1.8
|
||||
greenlet==0.4.13
|
||||
hacking==1.1.0
|
||||
hacking==3.0.0
|
||||
idna==2.6
|
||||
imagesize==1.0.0
|
||||
iso8601==0.1.11
|
||||
|
|
@ -55,8 +55,8 @@ kombu==4.1.0
|
|||
linecache2==1.0.0
|
||||
logilab-common==1.4.1
|
||||
Mako==1.0.7
|
||||
MarkupSafe==1.0
|
||||
mccabe==0.2.1
|
||||
MarkupSafe==1.1
|
||||
mccabe==0.6.0
|
||||
microversion-parse==0.2.1
|
||||
mock==2.0.0
|
||||
monotonic==1.4
|
||||
|
|
@ -100,7 +100,7 @@ pyasn1==0.4.2
|
|||
pycadf==2.7.0
|
||||
pycparser==2.18
|
||||
pycodestyle==2.4.0
|
||||
pyflakes==0.8.1
|
||||
pyflakes==2.0.0
|
||||
Pygments==2.2.0
|
||||
pyinotify==0.9.6
|
||||
pylint==1.4.5
|
||||
|
|
@ -157,7 +157,7 @@ unittest2==1.1.0
|
|||
urllib3==1.22
|
||||
vine==1.1.4
|
||||
voluptuous==0.11.1
|
||||
warlock==1.3.0
|
||||
warlock==1.1.0
|
||||
WebOb==1.7.1
|
||||
Werkzeug==0.14.1
|
||||
wrapt==1.10.11
|
||||
|
|
|
|||
Loading…
Reference in New Issue