Fix gate jobs
This patch update the following: * add ignore_basepython_conflict = true in tox.ini file. * replace horizon tarballs dependency with constraints file. * update hacking version to latest 4.0.0 version. * fix pep8 warnings. Change-Id: If0275b78f9084e314e6a69e267a79fc4472c0dfe (cherry picked from commitf5473fc236
) (cherry picked from commitcc68bea1c6
) Change-Id: I0ff28d6895f46faab041734c2d0ff838daf16aaa (cherry picked from commit0734ddd242
) Change-Id: I6cfcb8499177868ff41ec7313dd5ad1a7cd069c9 (cherry picked from commit0fe6e0fcbe
) Change-Id: I1267b8d672a8f4157809feec305c14cd76849f7e
This commit is contained in:
parent
82df9c6400
commit
248d49f1ec
@ -80,8 +80,7 @@ class ActionExecutionsTable(tables.DataTable):
|
|||||||
|
|
||||||
def getHoverHelp(data):
|
def getHoverHelp(data):
|
||||||
if hasattr(data, 'state_info') and data.state_info:
|
if hasattr(data, 'state_info') and data.state_info:
|
||||||
|
return {'title': data.state_info}
|
||||||
return {'title': data.state_info}
|
|
||||||
|
|
||||||
STATE_STATUS_CHOICES = (
|
STATE_STATUS_CHOICES = (
|
||||||
("success", True),
|
("success", True),
|
||||||
|
@ -55,9 +55,9 @@ def get_data(self, datum, column, row):
|
|||||||
|
|
||||||
if (template.defaultfilters.urlize in column.filters or
|
if (template.defaultfilters.urlize in column.filters or
|
||||||
template.defaultfilters.yesno in column.filters):
|
template.defaultfilters.yesno in column.filters):
|
||||||
data = widget.render(widget_name,
|
data = widget.render(widget_name,
|
||||||
column.get_raw_data(datum),
|
column.get_raw_data(datum),
|
||||||
form_field_attributes)
|
form_field_attributes)
|
||||||
else:
|
else:
|
||||||
data = widget.render(widget_name,
|
data = widget.render(widget_name,
|
||||||
column.get_data(datum),
|
column.get_data(datum),
|
||||||
|
@ -158,8 +158,7 @@ class ExecutionsTable(tables.DataTable):
|
|||||||
|
|
||||||
def getHoverHelp(data):
|
def getHoverHelp(data):
|
||||||
if hasattr(data, 'state_info') and data.state_info:
|
if hasattr(data, 'state_info') and data.state_info:
|
||||||
|
return {'title': data.state_info}
|
||||||
return {'title': data.state_info}
|
|
||||||
|
|
||||||
STATE_STATUS_CHOICES = (
|
STATE_STATUS_CHOICES = (
|
||||||
("success", True),
|
("success", True),
|
||||||
|
@ -60,8 +60,7 @@ class TaskTable(tables.DataTable):
|
|||||||
|
|
||||||
def getHoverHelp(data):
|
def getHoverHelp(data):
|
||||||
if hasattr(data, 'state_info') and data.state_info:
|
if hasattr(data, 'state_info') and data.state_info:
|
||||||
|
return {'title': data.state_info}
|
||||||
return {'title': data.state_info}
|
|
||||||
|
|
||||||
STATE_STATUS_CHOICES = (
|
STATE_STATUS_CHOICES = (
|
||||||
("success", True),
|
("success", True),
|
||||||
|
@ -16,5 +16,5 @@
|
|||||||
from horizon.test.settings import * # noqa
|
from horizon.test.settings import * # noqa
|
||||||
from openstack_dashboard.test.settings import * # noqa
|
from openstack_dashboard.test.settings import * # noqa
|
||||||
|
|
||||||
INSTALLED_APPS = list(INSTALLED_APPS)
|
INSTALLED_APPS = list(INSTALLED_APPS) # noqa: F405
|
||||||
INSTALLED_APPS.append('mistraldashboard')
|
INSTALLED_APPS.append('mistraldashboard')
|
||||||
|
@ -6,3 +6,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
|||||||
iso8601>=0.1.11 # MIT
|
iso8601>=0.1.11 # MIT
|
||||||
python-mistralclient!=3.2.0,>=3.1.0 # Apache-2.0
|
python-mistralclient!=3.2.0,>=3.1.0 # Apache-2.0
|
||||||
PyYAML>=3.12 # MIT
|
PyYAML>=3.12 # MIT
|
||||||
|
horizon>=17.1.0 # Apache-2.0
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
# 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.
|
||||||
|
|
||||||
# Hacking already pins down pep8, pyflakes and flake8
|
# hacking should appear first in case something else depends on pep8
|
||||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
hacking>=4.0.0,<4.1.0 # Apache-2.0
|
||||||
|
|
||||||
# Testing Requirements
|
# Testing Requirements
|
||||||
coverage!=4.4,>=4.0 # Apache-2.0
|
coverage!=4.4,>=4.0 # Apache-2.0
|
||||||
|
6
tox.ini
6
tox.ini
@ -2,15 +2,15 @@
|
|||||||
minversion = 2.0
|
minversion = 2.0
|
||||||
envlist = pep8,py27,py37
|
envlist = pep8,py27,py37
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
ignore_basepython_conflict = true
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} {opts} {packages}
|
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
|
||||||
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
http://tarballs.openstack.org/horizon/horizon-master.tar.gz
|
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.pyc" -delete
|
find . -type f -name "*.pyc" -delete
|
||||||
/bin/bash run_tests.sh -N --no-pep8 {posargs}
|
/bin/bash run_tests.sh -N --no-pep8 {posargs}
|
||||||
|
Loading…
Reference in New Issue
Block a user