Update requirements and lower-constraints
Changes prompted by the new pip resolver doing stricter dependency checking: - req, lc: cinder to 17.0.0 (victoria official release) - lc: os-brick: 2.7.0 -> 4.0.1 (victoria official release) - lc: stevedore: 1.20.0 -> 1.31.0 (version in victoria cinder l-c) - update test-req to match cinder stable/victoria versions - added some indirect dependencies to test-requirements.txt to help speed up dependency resolution This patch is picking up an updated flake8 that is more strict about import order checking, so we add a per-file-ignore config option to tox.ini to turn off E402 detection for the affected files. See comment in cinderlib/cinder.py for details. NOTE: per-file-ignores requires flake8>=3.7.0, but we don't specify that here because the flake8 version is controlled by hacking. Change-Id: I6e7fb6724bb29078b2fa70a38f37238c356e6f48
This commit is contained in:
@@ -1,8 +1,10 @@
|
|||||||
cinder==13.0.0
|
cinder==17.0.0
|
||||||
mock==2.0.0
|
mock==2.0.0
|
||||||
os-brick==2.7.0
|
os-brick==4.0.1
|
||||||
pbr==2.0.0
|
oslo.context==2.23.0
|
||||||
six==1.10.0
|
oslo.db==6.0.0
|
||||||
stestr==1.0.0
|
pbr==5.4.1
|
||||||
stevedore==1.20.0
|
six==1.11.0
|
||||||
|
stestr==2.2.0
|
||||||
|
stevedore==1.31.0
|
||||||
urllib3==1.21.1
|
urllib3==1.21.1
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
cinder>=15.0.0 # Apache-2.0
|
cinder>=17.0.0 # Apache-2.0
|
||||||
importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0
|
importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0
|
||||||
|
|||||||
@@ -2,11 +2,17 @@
|
|||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
pbr>=5.4.1 # Apache-2.0
|
||||||
hacking>=3.0.1,<3.1.0 # Apache-2.0
|
hacking>=3.0.1,<3.2.0 # Apache-2.0
|
||||||
coverage!=4.4,>=4.0 # Apache-2.0
|
coverage!=4.4,>=4.1 # Apache-2.0
|
||||||
ddt>=1.0.1 # MIT
|
ddt>=1.2.1 # MIT
|
||||||
oslotest>=3.2.0 # Apache-2.0
|
oslotest>=3.2.0 # Apache-2.0
|
||||||
testscenarios>=0.4 # Apache-2.0/BSD
|
testscenarios>=0.4 # Apache-2.0/BSD
|
||||||
testtools>=2.2.0 # MIT
|
testtools>=2.4.0 # MIT
|
||||||
stestr>=1.0.0 # Apache-2.0
|
stestr>=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.context>=2.23.0 # Apache-2.0
|
||||||
|
oslo.db>=6.0.0 # Apache-2.0
|
||||||
|
|||||||
7
tox.ini
7
tox.ini
@@ -143,6 +143,13 @@ commands =
|
|||||||
coverage html -d cover
|
coverage html -d cover
|
||||||
coverage xml -o cover/coverage.xml
|
coverage xml -o cover/coverage.xml
|
||||||
|
|
||||||
|
[flake8]
|
||||||
|
# see comment in cinderlib/cinderlib.py for why we need to ignore E402
|
||||||
|
# (import order) in these files
|
||||||
|
per-file-ignores =
|
||||||
|
cinderlib/cinderlib.py:E402
|
||||||
|
cinderlib/cmd/cinder_to_yaml.py:E402
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
commands=flake8 {posargs} .
|
commands=flake8 {posargs} .
|
||||||
deps=
|
deps=
|
||||||
|
|||||||
Reference in New Issue
Block a user