Browse Source

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):
  - pycodestyle 2.0.0 is required by flake8 2.6.2
  - 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)
(cherry picked from commit 699744e863)
changes/66/803066/3
Elod Illes 10 months ago
parent
commit
ae4f27fe0f
  1. 5
      .zuul.yaml
  2. 6
      lower-constraints.txt
  3. 1
      tox.ini

5
.zuul.yaml

@ -5,7 +5,6 @@
- openstack-python3-train-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
- check-requirements
- release-notes-jobs-python3
check:
jobs:
@ -19,6 +18,8 @@
- sahara-tests-tempest-v2
- openstack-tox-cover:
voting: false
- requirements-check:
nodeset: ubuntu-bionic
- sahara-grenade
- sahara-tests-scenario-py3:
voting: false
@ -34,6 +35,8 @@
# - sahara-tests-scenario-v2
- sahara-tests-tempest
- sahara-tests-tempest-v2
- requirements-check:
nodeset: ubuntu-bionic
- sahara-grenade
- sahara-tripleo-ci-centos-8-scenario003-standalone: *tripleo_sa
- sahara-openstack-ansible-functional

6
lower-constraints.txt

@ -55,7 +55,7 @@ kombu==4.1.0
linecache2==1.0.0
logilab-common==1.4.1
Mako==1.0.7
MarkupSafe==1.0
MarkupSafe==1.1
mccabe==0.2.1
microversion-parse==0.2.1
mock==2.0.0
@ -99,7 +99,7 @@ psycopg2==2.7.3
pyasn1==0.4.2
pycadf==2.7.0
pycparser==2.18
pycodestyle==2.4.0
pycodestyle==2.0.0
pyflakes==0.8.1
Pygments==2.2.0
pyinotify==0.9.6
@ -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

1
tox.ini

@ -65,6 +65,7 @@ commands = {posargs}
basepython = python3
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands =
rm -rf doc/html doc/build

Loading…
Cancel
Save