Browse Source

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 commit f5473fc236)
changes/16/786216/3
manchandavishal 3 months ago
committed by Tobias Urdin
parent
commit
897b07fc85
7 changed files with 14 additions and 21 deletions
  1. +1
    -2
      mistraldashboard/action_executions/tables.py
  2. +3
    -3
      mistraldashboard/default/smart_cell.py
  3. +1
    -2
      mistraldashboard/executions/tables.py
  4. +1
    -2
      mistraldashboard/tasks/tables.py
  5. +1
    -1
      mistraldashboard/test/settings.py
  6. +2
    -6
      test-requirements.txt
  7. +5
    -5
      tox.ini

+ 1
- 2
mistraldashboard/action_executions/tables.py View File

@ -80,8 +80,7 @@ class ActionExecutionsTable(tables.DataTable):
def getHoverHelp(data):
if hasattr(data, 'state_info') and data.state_info:
return {'title': data.state_info}
return {'title': data.state_info}
STATE_STATUS_CHOICES = (
("success", True),


+ 3
- 3
mistraldashboard/default/smart_cell.py View File

@ -53,9 +53,9 @@ def get_data(self, datum, column, row):
if (template.defaultfilters.urlize in column.filters or
template.defaultfilters.yesno in column.filters):
data = widget.render(widget_name,
column.get_raw_data(datum),
form_field_attributes)
data = widget.render(widget_name,
column.get_raw_data(datum),
form_field_attributes)
else:
data = widget.render(widget_name,
column.get_data(datum),


+ 1
- 2
mistraldashboard/executions/tables.py View File

@ -155,8 +155,7 @@ class ExecutionsTable(tables.DataTable):
def getHoverHelp(data):
if hasattr(data, 'state_info') and data.state_info:
return {'title': data.state_info}
return {'title': data.state_info}
STATE_STATUS_CHOICES = (
("success", True),


+ 1
- 2
mistraldashboard/tasks/tables.py View File

@ -57,8 +57,7 @@ class TaskTable(tables.DataTable):
def getHoverHelp(data):
if hasattr(data, 'state_info') and data.state_info:
return {'title': data.state_info}
return {'title': data.state_info}
STATE_STATUS_CHOICES = (
("success", True),


+ 1
- 1
mistraldashboard/test/settings.py View File

@ -16,5 +16,5 @@
from horizon.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')

+ 2
- 6
test-requirements.txt View File

@ -2,12 +2,8 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
# Hacking already pins down pep8, pyflakes and flake8
hacking!=0.13.0,<0.14,>=0.12.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
# hacking should appear first in case something else depends on pep8
hacking>=4.0.0,<4.1.0 # Apache-2.0
# Testing Requirements
coverage!=4.4,>=4.0 # Apache-2.0


+ 5
- 5
tox.ini View File

@ -2,16 +2,16 @@
minversion = 2.0
envlist = pep8,py38
skipsdist = True
ignore_basepython_conflict = true
[testenv]
basepython = python3
usedevelop = True
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
setenv =
VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/requirements.txt
deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
http://tarballs.openstack.org/horizon/horizon-master.tar.gz
commands =
find . -type f -name "*.pyc" -delete
/bin/bash run_tests.sh -N --no-pep8 {posargs}
@ -35,7 +35,7 @@ commands =
[testenv:docs]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands =
@ -51,7 +51,7 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject,tools,hori
[testenv:releasenotes]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html

Loading…
Cancel
Save