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
This commit is contained in:
parent
66154b7011
commit
0734ddd242
@ -80,7 +80,6 @@ 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 = (
|
||||||
|
@ -155,7 +155,6 @@ 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 = (
|
||||||
|
@ -57,7 +57,6 @@ 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 = (
|
||||||
|
@ -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) # noqa: F999
|
INSTALLED_APPS = list(INSTALLED_APPS) # noqa: F405
|
||||||
INSTALLED_APPS.append('mistraldashboard')
|
INSTALLED_APPS.append('mistraldashboard')
|
||||||
|
@ -2,12 +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
|
||||||
# remove this pyflakes from here once you bump the
|
|
||||||
# hacking to 3.2.0 or above. hacking 3.2.0 takes
|
|
||||||
# care of pyflakes version compatibilty.
|
|
||||||
pyflakes>=2.1.1
|
|
||||||
|
|
||||||
# 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,16 +2,16 @@
|
|||||||
minversion = 2.0
|
minversion = 2.0
|
||||||
envlist = pep8,py38
|
envlist = pep8,py38
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
ignore_basepython_conflict = true
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria} {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/victoria}
|
||||||
|
-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