Update requirements and lower-constraints
Changes prompted by the new pip resolver doing stricter dependency checking: - req, lc: cinder to 16.0.0 (ussuri official release) - req: restrict cinder to < 17.0.0 (victoria) because cinder is not in upper-constraints - req, lc: os-brick: to 3.0.1 (ussuri official release) - update test-req to match cinder stable/ussuri versions - added some indirect dependencies to test-requirements.txt to help speed up dependency resolution - doc/req: openstackdocstheme, reno exceeded ussuri upper constraint - tox.ini: base testenv: added upper-constraints and changed it to use cinder and os-brick from pypi instead of master Change-Id: I86ccab516108615d6f718c6fdc9d3e4fad67ee05
This commit is contained in:
parent
2fe1ba289c
commit
7fdbadddaf
|
@ -1,5 +1,5 @@
|
|||
openstackdocstheme>=2.2.1 # Apache-2.0
|
||||
reno>=3.1.0 # Apache-2.0
|
||||
openstackdocstheme>=2.0.0 # Apache-2.0
|
||||
reno>=2.5.0 # Apache-2.0
|
||||
doc8>=0.6.0 # Apache-2.0
|
||||
sphinx>=2.0.0,!=2.1.0 # BSD
|
||||
os-api-ref>=1.4.0 # Apache-2.0
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
cinder==13.0.0
|
||||
cinder==16.0.0
|
||||
mock==2.0.0
|
||||
os-brick==2.7.0
|
||||
os-brick==3.0.1
|
||||
oslo.config==5.2.0
|
||||
oslo.context==2.22.0
|
||||
oslo.db==4.35.0
|
||||
pbr==2.0.0
|
||||
six==1.10.0
|
||||
stestr==1.0.0
|
||||
stestr==2.2.0
|
||||
stevedore==1.20.0
|
||||
urllib3==1.21.1
|
||||
|
|
|
@ -1 +1,2 @@
|
|||
cinder>=15.0.0 # Apache-2.0
|
||||
cinder>=16.0.0,<17.0.0 # Apache-2.0
|
||||
os-brick>=3.0.1
|
||||
|
|
|
@ -5,8 +5,15 @@
|
|||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||
hacking>=3.0.1,<3.1.0 # Apache-2.0
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
ddt>=1.0.1 # MIT
|
||||
ddt>=1.2.1 # MIT
|
||||
oslotest>=3.2.0 # Apache-2.0
|
||||
testscenarios>=0.4 # Apache-2.0/BSD
|
||||
testtools>=2.2.0 # MIT
|
||||
stestr>=1.0.0 # Apache-2.0
|
||||
stestr!=2.3.0,>=2.2.0 # Apache-2.0
|
||||
#
|
||||
# These are included to constrain the range of possible versions
|
||||
# considered by the pip resolver. They are not direct dependencies
|
||||
# of cinderlib.
|
||||
oslo.config>=5.2.0 # Apache-2.0
|
||||
oslo.context>=2.22.0 # Apache-2.0
|
||||
oslo.db>=4.35.0 # Apache-2.0
|
||||
|
|
10
tox.ini
10
tox.ini
|
@ -15,13 +15,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.
|
||||
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/ussuri}
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
||||
commands =
|
||||
find . -ignore_readdir_race -type f -name "*.pyc" -delete
|
||||
|
|
Loading…
Reference in New Issue