Browse Source

Update tox.ini for new upper constraints strategy

The requirements team has defined a new strategy for handling
upper constraints[1]. This patch applies those strategies to
Octavia.

[1] http://lists.openstack.org/pipermail/openstack-discuss/ \
    2019-May/006478.html

Change-Id: I3db53821520e54747697808c7eb6988cc1556513
changes/58/668258/1
Michael Johnson 2 months ago
parent
commit
7eb83accd5
1 changed files with 6 additions and 5 deletions
  1. 6
    5
      tox.ini

+ 6
- 5
tox.ini View File

@@ -8,9 +8,10 @@ usedevelop = True
8 8
 setenv = VIRTUAL_ENV={envdir}
9 9
          PYTHONWARNINGS=default::DeprecationWarning
10 10
 install_command =
11
-    pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} {opts} {packages}
11
+    pip install {opts} {packages}
12 12
 whitelist_externals = find
13
-deps = -r{toxinidir}/requirements.txt
13
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/queens}
14
+       -r{toxinidir}/requirements.txt
14 15
        -r{toxinidir}/test-requirements.txt
15 16
 commands =
16 17
   stestr run '{posargs}'
@@ -20,7 +21,7 @@ commands =
20 21
 # This environment is called from CI scripts to test and publish
21 22
 # the API Ref to developer.openstack.org.
22 23
 deps =
23
-    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens}
24
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/queens}
24 25
     -r{toxinidir}/requirements.txt
25 26
     -r{toxinidir}/doc/requirements.txt
26 27
 whitelist_externals = rm
@@ -80,7 +81,7 @@ whitelist_externals =
80 81
 
81 82
 [testenv:docs]
82 83
 deps =
83
-    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens}
84
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/queens}
84 85
     -r{toxinidir}/requirements.txt
85 86
     -r{toxinidir}/doc/requirements.txt
86 87
 whitelist_externals = rm
@@ -143,7 +144,7 @@ max-line-length = 79
143 144
 
144 145
 [testenv:releasenotes]
145 146
 deps =
146
-    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens}
147
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/queens}
147 148
     -r{toxinidir}/requirements.txt
148 149
     -r{toxinidir}/doc/requirements.txt
149 150
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html

Loading…
Cancel
Save