Merge branch 'consolidate'

mozilla · Jun 3, 2015 · 53e04e4 · 53e04e4
2 parents b6079a7 + 5e5a302
commit 53e04e4
Show file tree

Hide file tree

Showing 141 changed files with 6,695 additions and 643 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,7 @@
 # NOTE: these files must *also* be specified in setup.py
-include docs/conf.py
-recursive-include docs *.rst
-recursive-include docs/_static *
+include relengapi/docs/conf.py
+recursive-include relengapi/docs *.rst
+recursive-include relengapi/docs/_static *
 recursive-include relengapi *.html *.jpg *.css *.js *.txt *.map *.eot *.svg *.ttf *.woff
 include LICENSE.txt
 include README.md

diff --git a/docs/deployment/@relengapi/config.rst b/docs/deployment/@relengapi/config.rst
diff --git a/docs/deployment/@relengapi/index.rst b/docs/deployment/@relengapi/index.rst
diff --git a/docs/development/index.rst b/docs/development/index.rst
diff --git a/docs/usage/@relengapi/index.rst b/docs/usage/@relengapi/index.rst
diff --git a/docs/usage/index.rst b/docs/usage/index.rst
diff --git a/relengapi/__init__.py b/relengapi/__init__.py
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)  # pragma: no cover

diff --git a/relengapi/app.py b/relengapi/app.py
@@ -4,6 +4,7 @@
 
 import logging
 import os
+import pkg_resources
 import relengapi
 import wsme.types
 
@@ -36,7 +37,7 @@ class BlueprintInfo(wsme.types.Base):
 
     "Information about an installed Blueprint"
 
-    #: Python distribution containing this blueprint
+    #: Python distribution containing this blueprint (always 'relengapi')
     distribution = unicode
 
     #: Version of the blueprint (really, of its distribution)
@@ -53,8 +54,7 @@ class DistributionInfo(wsme.types.Base):
     #: Version of the distribution
     version = unicode
 
-    # TODO: ref docs
-    #: Additional RelengAPI-specific metadata
+    #: Additional RelengAPI-specific metadata (deprecated; always empty)
     relengapi_metadata = {unicode: unicode}
 
 
@@ -69,9 +69,24 @@ class VersionInfo(wsme.types.Base):
     blueprints = {unicode: BlueprintInfo}
 
 
-def create_app(cmdline=False, test_config=None):
-    blueprints = introspection.get_blueprints()
+def _load_bp(n):
+    relengapi_mod = __import__('relengapi.blueprints.' + n)
+    return getattr(relengapi_mod.blueprints, n).bp
+
+blueprints = [_load_bp(n) for n in [
+    'auth',
+    'badpenny',
+    'base',
+    'clobberer',
+    'docs',
+    'mapper',
+    'slaveloan',
+    'tokenauth',
+    'tooltool',
+]]
+
 
+def create_app(cmdline=False, test_config=None):
     app = Flask(__name__)
     env_var = 'RELENGAPI_SETTINGS'
     if test_config:
@@ -125,20 +140,15 @@ def root():
     def versions():
         dists = {}
         for dist in introspection.get_distributions().itervalues():
-            relengapi_metadata = dist.relengapi_metadata
             dists[dist.key] = DistributionInfo(
                 project_name=dist.project_name,
                 version=dist.version,
-                relengapi_metadata=relengapi_metadata)
+                relengapi_metadata={})
         blueprints = {}
+        relengapi_dist = pkg_resources.get_distribution('relengapi')
         for bp in app.relengapi_blueprints.itervalues():
-            blueprints[bp.name] = BlueprintInfo(distribution=bp.dist.key,
-                                                version=bp.dist.version)
+            blueprints[bp.name] = BlueprintInfo(distribution='relengapi',
+                                                version=relengapi_dist.version)
         return VersionInfo(distributions=dists, blueprints=blueprints)
 
     return app
-
-metadata = {
-    'repository_of_record': 'https://git.mozilla.org/?p=build/relengapi.git',
-    'bug_report_url': 'https://github.com/mozilla/build-relengapi/issues',
-}
diff --git a/relengapi/blueprints/__init__.py b/relengapi/blueprints/__init__.py
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)  # pragma: no cover