Browse Source

[stein-only] Fix networking-bgpvpn and neutron requirement constraints

Ussuri version of networking-bgpvpn (12.0.0) was released and with that
version of networking-bgpvpn tox -e docs started to fail when tox
installs latest bgpvpn. Let's constrain networking-bgpvpn to Stein
versions. This needs to be done in requirements.txt, since
networking-bgpvpn is not part of upper-constraints.txt.

Now that requirements.txt is modified the check job finds problem with
neutron constraints as well. The problems comes due to neutron was
meanwhile added to upper-constraints.txt. This patch fixes neutron's
requirements to make the check job pass.

Docs tox target's dependencies had to be updated to make use of the
upper-constraints.txt. However sphinx installs bagpipe and its
requirements.txt it does not use the upper constraints so let's
install the requirements earlier with the 'deps'.

Depends-On: https://review.opendev.org/#/c/730379
Change-Id: I599ba9823bbf3abc770cb9893489f42c7dbf477e
changes/36/729936/4
Előd Illés 1 month ago
committed by Elod Illes
parent
commit
a1b587befd
2 changed files with 6 additions and 3 deletions
  1. +2
    -2
      requirements.txt
  2. +4
    -1
      tox.ini

+ 2
- 2
requirements.txt View File

@@ -25,8 +25,8 @@ pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.1.1 # BSD

# OpenStack CI will install the following projects from git
# if they are in the required-projects list for a job:
neutron>=13.0.0,<15.0.0 # Apache-2.0
networking-bgpvpn>=9.0.0 # Apache-2.0
neutron>=13.0.2.0 # Apache-2.0
networking-bgpvpn>=9.0.0,<11.0.0 # Apache-2.0
networking-sfc>=8.0.0.0b1 # Apache-2.0

# The comment below indicates this project repo is current with neutron-lib


+ 4
- 1
tox.ini View File

@@ -79,7 +79,10 @@ commands =

[testenv:docs]
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/stein}
-r{toxinidir}/doc/requirements.txt
-r{toxinidir}/requirements.txt
commands = sphinx-build -W -b html doc/source doc/build/html

[testenv:debug]


Loading…
Cancel
Save