Fix horizon dependency
This commit moves horizon to requirements.txt. horizon was added to upper-constraints in stable branches recently, so installing from the tarball no longer works. upper-constraints in stable branches picks up the right version of horizon, so there is no need for the upper bound of the horizon version. In addition, the link of the horizon tarball was not updated after the stable branch was created. I don't know why it works for stable/train but I believe this commit mitigates the situation as the upper-constraints file in the requirements repo picks up the right version of horizon. This commit is proposed directly as the similar change in the master branch happened as part of Django 1.11 drop [1]. The way to specify upper-constraints.txt is also update to follow the convention used widely in the OpenStack community. The contraints file is now specified in "deps" section. This allows us to use the lower-constraints file correctly. Previously upper-constraints.txt was actually used in the lower-constraints job unexpectedly. sphinx entry in test-requirements.txt did not match global-requirements. This commit updates it to match the current global-requirements. [1] https://review.opendev.org/#/c/700845/ Change-Id: I9a310446743cfe6bca5480455b91a7cd74da8785 (cherry picked from commitefa4927bb7
) (cherry picked from commit5c593fd34a
)
This commit is contained in:
parent
efc85175da
commit
ca94a7661e
|
@ -28,6 +28,7 @@ fixtures==3.0.0
|
||||||
flake8==2.5.5
|
flake8==2.5.5
|
||||||
futurist==1.6.0
|
futurist==1.6.0
|
||||||
hacking==0.12.0
|
hacking==0.12.0
|
||||||
|
horizon==14.0.0
|
||||||
idna==2.6
|
idna==2.6
|
||||||
imagesize==1.0.0
|
imagesize==1.0.0
|
||||||
iso8601==0.1.12
|
iso8601==0.1.12
|
||||||
|
@ -60,7 +61,7 @@ oslo.policy==1.34.0
|
||||||
oslo.serialization==2.25.0
|
oslo.serialization==2.25.0
|
||||||
oslo.utils==3.36.0
|
oslo.utils==3.36.0
|
||||||
oslotest==3.2.0
|
oslotest==3.2.0
|
||||||
osprofiler==2.0.0
|
osprofiler==2.3.0
|
||||||
packaging==17.1
|
packaging==17.1
|
||||||
pbr==2.0.0
|
pbr==2.0.0
|
||||||
pep8==1.5.7
|
pep8==1.5.7
|
||||||
|
|
|
@ -4,3 +4,4 @@
|
||||||
|
|
||||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||||
python-ironicclient>=2.3.0 # Apache-2.0
|
python-ironicclient>=2.3.0 # Apache-2.0
|
||||||
|
horizon>=14.0.0
|
||||||
|
|
|
@ -13,8 +13,7 @@ testscenarios>=0.4 # Apache-2.0/BSD
|
||||||
testtools>=2.2.0 # MIT
|
testtools>=2.2.0 # MIT
|
||||||
|
|
||||||
# this is required for the docs build jobs
|
# this is required for the docs build jobs
|
||||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
|
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
|
||||||
|
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
|
||||||
openstackdocstheme>=1.18.1 # Apache-2.0
|
openstackdocstheme>=1.18.1 # Apache-2.0
|
||||||
reno>=2.5.0 # Apache-2.0
|
reno>=2.5.0 # Apache-2.0
|
||||||
# Include horizon as test requirement
|
|
||||||
http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon
|
|
||||||
|
|
7
tox.ini
7
tox.ini
|
@ -5,7 +5,6 @@ envlist = py35,py27,pep8
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} {opts} {packages}
|
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
NOSE_WITH_OPENSTACK=1
|
NOSE_WITH_OPENSTACK=1
|
||||||
NOSE_OPENSTACK_COLOR=1
|
NOSE_OPENSTACK_COLOR=1
|
||||||
|
@ -13,8 +12,10 @@ setenv = VIRTUAL_ENV={envdir}
|
||||||
NOSE_OPENSTACK_YELLOW=0.025
|
NOSE_OPENSTACK_YELLOW=0.025
|
||||||
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
||||||
DJANGO_SETTINGS_MODULE=ironic_ui.test.settings
|
DJANGO_SETTINGS_MODULE=ironic_ui.test.settings
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps =
|
||||||
-r{toxinidir}/test-requirements.txt
|
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky}
|
||||||
|
-r{toxinidir}/requirements.txt
|
||||||
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = {toxinidir}/manage.py test ironic_ui --settings=ironic_ui.test.settings
|
commands = {toxinidir}/manage.py test ironic_ui --settings=ironic_ui.test.settings
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
|
|
Loading…
Reference in New Issue