From ef98ec2aee205d82c5eeb79b99e2dce74ef0cefe Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Tue, 26 Jan 2021 08:31:05 -0500
Subject: [PATCH] Update requirements

- cap cinder at < 18.0.0 (wallaby) in requirements.txt because cinder
  isn't in upper-constraints
- add os-brick>=4.0.1 (victoria official release) to requirements
- tox.ini: base testenv: add upper-constraints and change to use
  cinder and os-brick from pypi instead of master

Change-Id: I59a2dd3cd2e56a83702e75086bec75569060167f
---
 requirements.txt |  3 ++-
 tox.ini          | 11 +++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 942afcb..e242646 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
-cinder>=17.0.0 # Apache-2.0
+cinder>=17.0.0,<18.0.0 # Apache-2.0
+os-brick>=4.0.1
 importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0
diff --git a/tox.ini b/tox.ini
index ff7a08b..597b8ef 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,14 +16,9 @@ setenv = OS_STDOUT_CAPTURE=1
          OS_TEST_PATH=./cinderlib/tests/unit
 usedevelop=True
 install_command = pip install {env:PIP_OPTIONS:} {opts} {packages}
-# Use cinder from master instead of from PyPi. Defining the egg name we won't
-# overwrite the package installed by Zuul on jobs supporting cross-project
-# dependencies (include Cinder in required-projects).  This allows us to also
-# run local tests against master.
-# NOTE: Functional tests may fail if host is missing bindeps from deps projects
-deps= -r{toxinidir}/test-requirements.txt
-      git+https://opendev.org/openstack/os-brick#egg=os-brick
-      git+https://opendev.org/openstack/cinder#egg=cinder
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
+       -r{toxinidir}/test-requirements.txt
+       -r{toxinidir}/requirements.txt
 
 commands =
     find . -ignore_readdir_race -type f -name "*.pyc" -delete