openstack/watcher-dashboard
Code Issues Proposed changes

Merge "Update hacking version"

Browse Source
This commit is contained in:
Zuul 2019-01-25 01:31:58 +00:00 committed by Gerrit Code Review
commit 50437a47e4
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-requirements.txt
View File

@ -3,7 +3,7 @@
# 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 already pins down pep8, pyflakes and flake8
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 hacking>=1.1.0,<1.2.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0
mock>=2.0.0 # BSD mock>=2.0.0 # BSD
python-subunit>=1.0.0 # Apache-2.0/BSD python-subunit>=1.0.0 # Apache-2.0/BSD

3
tox.ini
View File

@ -60,6 +60,9 @@ basepython = python3
commands = oslo_debug_helper {posargs} commands = oslo_debug_helper {posargs}
[flake8] [flake8]
# F405 TEMPLATES may be undefined, or defined from star imports
# (because it is not easy to avoid this in openstack_dashboard.test.settings)
ignore = F405
show-source = True show-source = True
builtins = _ builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject,tools exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject,tools

8
watcher_dashboard/test/settings.py
View File

@ -14,6 +14,10 @@
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
# Load the pluggable dashboard settings
import openstack_dashboard.enabled
import watcher_dashboard.local.enabled
INSTALLED_APPS = ( INSTALLED_APPS = (
'django.contrib.contenttypes', 'django.contrib.contenttypes',
'django.contrib.auth', 'django.contrib.auth',
@ -27,10 +31,6 @@ INSTALLED_APPS = (
'openstack_dashboard', 'openstack_dashboard',
) )
# Load the pluggable dashboard settings
import openstack_dashboard.enabled
import watcher_dashboard.local.enabled
INSTALLED_APPS = list(INSTALLED_APPS) # Make sure it's mutable INSTALLED_APPS = list(INSTALLED_APPS) # Make sure it's mutable
settings_utils.update_dashboards( settings_utils.update_dashboards(
[ [