Unifies the project packaging into one set of modules.

There are no longer two separate projects living inside the horizon
repository. There is a single project now with a single setup.py,
single README, etc.

The openstack-dashboard/dashboard django project is now named
"openstack_dashboard" and lives as an example project in the
topmost horizon directory.

The "horizon/horizon" directory has been bumped up a level and now
is directly on the path when the root horizon directory is on
your python path.

Javascript media which the horizon module directly relies upon
now ships in the horizon/static dir rather than
openstack-dashboard/dashboard/static.

All the corresponding setup, installation, build, and env scripts
have been updated accordingly.

Implements blueprint unified-packaging.

Change-Id: Ieed8e3c777432cd046c3e0298869a9428756ab62

Author: gabrielhurley

.gitignore

@@ -8,10 +8,8 @@ coverage.xml
 pep8.txt
 pylint.txt
 reports
-horizon/horizon.egg-info
-.horizon-venv
-openstack-dashboard/local/dashboard_openstack.sqlite3
-openstack-dashboard/local/local_settings.py
+horizon.egg-info
+openstack_dashboard/local/local_settings.py
 docs/build/
 docs/source/sourcecode
 .venv

horizon/Makefile Makefile

@@ -15,14 +15,12 @@
 import os
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-HORIZON_DIR = os.path.abspath(os.path.join(BASE_DIR, "..", "..", "horizon"))
-DASHBOARD_DIR = os.path.abspath(os.path.join(BASE_DIR, "..", "..", "openstack-dashboard"))
+ROOT = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
 
-sys.path.insert(0, HORIZON_DIR)
-sys.path.insert(0, DASHBOARD_DIR)
+sys.path.insert(0, ROOT)
 
 # This is required for ReadTheDocs.org, but isn't a bad idea anyway.
-os.environ['DJANGO_SETTINGS_MODULE'] = 'dashboard.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_dashboard.settings'
 
 import horizon.version
 
@@ -37,8 +35,6 @@ def find_autodoc_modules(module_name, sourcedir):
         for root, dirs, files in os.walk("."):
             for filename in files:
                 if filename.endswith(".py"):
-                    # root = ./dashboard/test/unit
-                    # filename = base.py
                     # remove the pieces of the root
                     elements = root.split(os.path.sep)
                     # replace the leading "." with the module name
@@ -53,10 +49,10 @@ def find_autodoc_modules(module_name, sourcedir):
         return modlist
 
     RSTDIR = os.path.abspath(os.path.join(BASE_DIR, "sourcecode"))
-    SRCS = {'horizon': HORIZON_DIR,
-            'dashboard': DASHBOARD_DIR}
+    SRCS = {'horizon': ROOT,
+            'openstack_dashboard': ROOT}
 
-    EXCLUDED_MODULES = ('horizon.tests', 'dashboard.tests',)
+    EXCLUDED_MODULES = ('horizon.tests', 'openstack_dashboard.tests',)
     CURRENT_SOURCES = {}
 
     if not(os.path.exists(RSTDIR)):
@@ -118,7 +114,7 @@ def find_autodoc_modules(module_name, sourcedir):
     # Delete auto-generated .rst files for sources which no longer exist
     for directory, subdirs, files in list(os.walk(RSTDIR)):
         for old_file in files:
-            if old_file not in CURRENT_SOURCES[directory]:
+            if old_file not in CURRENT_SOURCES.get(directory, []):
                 print "Removing outdated file for %s" % old_file
                 os.remove(os.path.join(directory, old_file))