Updated from global requirements

Fixed some bugs to make it pass

Change-Id: I18a366b46d27f6ec60a339ef8cc4856d1cbca241

requirements.txt

@@ -1,14 +1,15 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
 
-pbr>=1.8
+pbr>=1.6 # Apache-2.0
 # Horizon Core Requirements
-Django>=1.8,<1.9 # BSD
-django_compressor>=1.4 # MIT
-django_openstack_auth>=2.0.0 # Apache-2.0
-httplib2>=0.7.5  # MIT
-python-keystoneclient>=1.6.0,!=1.8.0,!=2.1.0 # Apache-2.0
+Django<1.9,>=1.8 # BSD
+django-compressor>=2.0 # MIT
+django-openstack-auth>=2.3.0 # Apache-2.0
+httplib2>=0.7.5 # MIT
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0
 pytz>=2013.6 # MIT
 
 # Watcher-specific requirements
-python-watcherclient
+python-watcherclient>=0.23.0 # Apache-2.0

setup.py

@@ -1,4 +1,3 @@
-
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

test-requirements.txt

@@ -6,22 +6,22 @@
 # Testing Requirements
 http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon
 
-hacking>=0.10.2,<0.11 # Apache-2.0
+hacking<0.11,>=0.10.2 # Apache-2.0
 coverage>=3.6 # Apache-2.0
 ddt>=1.0.1 # MIT
-django-nose>=1.2 # BSD
+django-nose>=1.4.4 # BSD
 discover # BSD
-mock>=1.2 # BSD
+mock>=2.0 # BSD
 mox3>=0.7.0 # Apache-2.0
 nose-exclude # LGPL
 python-subunit>=0.0.18 # Apache-2.0/BSD
-selenium!=2.49,!=2.50 # Apache-2.0
+selenium>=2.50.1 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 # This also needs xvfb library installed on your OS
-xvfbwrapper>=0.1.3,!=0.2.8 #license: MIT
+xvfbwrapper>=0.1.3 #license: MIT
 
 # Doc requirements
-oslosphinx>=2.5.0 # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+sphinx!=1.3b1,<1.3,>=1.2.1 # BSD

watcher_dashboard/test/helpers.py

@@ -21,6 +21,7 @@ from __future__ import unicode_literals
 import collections
 import copy
 from functools import wraps
+import importlib
 import json
 import os
 import unittest
@@ -31,7 +32,6 @@ from django.core.handlers import wsgi
 from django.core import urlresolvers
 from django.test.client import RequestFactory  # noqa
 from django.test import utils as django_test_utils
-from django.utils.importlib import import_module  # noqa
 from horizon import base
 from horizon import conf
 from horizon.test import helpers as horizon_helpers
@@ -304,7 +304,7 @@ class BaseAdminViewTests(TestCase):
 
     def set_session_values(self, **kwargs):
         settings.SESSION_ENGINE = 'django.contrib.sessions.backends.file'
-        engine = import_module(settings.SESSION_ENGINE)
+        engine = importlib.import_module(settings.SESSION_ENGINE)
         store = engine.SessionStore()
         for key in kwargs:
             store[key] = kwargs[key]
@@ -464,7 +464,7 @@ class PluginTestCase(TestCase):
         del base.Horizon
         base.Horizon = base.HorizonSite()
         # Reload the convenience references to Horizon stored in __init__
-        reload(import_module("horizon"))
+        reload(importlib.import_module("horizon"))
         # Re-register our original dashboards and panels.
         # This is necessary because autodiscovery only works on the first
         # import, and calling reload introduces innumerable additional
@@ -484,7 +484,7 @@ class PluginTestCase(TestCase):
         only for testing and should never be used on a live site.
         """
         urlresolvers.clear_url_caches()
-        reload(import_module(settings.ROOT_URLCONF))
+        reload(importlib.import_module(settings.ROOT_URLCONF))
         base.Horizon._urls()
 
 

watcher_dashboard/test/settings.py

@@ -15,10 +15,13 @@ import importlib
 import os
 import six
 
+from django.utils.translation import pgettext_lazy
 from horizon.test.settings import *  # noqa
 from horizon.utils import secret_key
 from openstack_dashboard import exceptions
-
+from openstack_dashboard.static_settings import find_static_files  # noqa
+from openstack_dashboard.static_settings import get_staticfiles_dirs  # noqa
+from openstack_dashboard import theme_settings
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -75,6 +78,49 @@ HORIZON_CONFIG = {
     'js_files': [],
 }
 
+# ### THEMING ### #
+
+# Deprecated Theme Settings
+CUSTOM_THEME_PATH = None
+DEFAULT_THEME_PATH = None
+# The default theme if no cookie is present
+DEFAULT_THEME = 'default'
+# Theme Static Directory
+THEME_COLLECTION_DIR = 'themes'
+
+AVAILABLE_THEMES = [
+    (
+        'default',
+        pgettext_lazy('Default style theme', 'Default'),
+        'themes/default'
+    ), (
+        'material',
+        pgettext_lazy("Google's Material Design style theme", "Material"),
+        'themes/material'
+    ),
+]
+
+AVAILABLE_THEMES, DEFAULT_THEME = theme_settings.get_available_themes(
+    AVAILABLE_THEMES,
+    CUSTOM_THEME_PATH,
+    DEFAULT_THEME_PATH,
+    DEFAULT_THEME
+)
+
+STATICFILES_DIRS = get_staticfiles_dirs(STATIC_URL) + \
+    theme_settings.get_theme_static_dirs(
+        AVAILABLE_THEMES,
+        THEME_COLLECTION_DIR,
+        ROOT_PATH)
+
+# populate HORIZON_CONFIG with auto-discovered JavaScript sources, mock files,
+# specs files and external templates.
+find_static_files(HORIZON_CONFIG, AVAILABLE_THEMES,
+                  THEME_COLLECTION_DIR, ROOT_PATH)
+
+# ############## #
+
+
 # Load the pluggable dashboard settings
 from openstack_dashboard.utils import settings
 dashboard_module_names = [