Merge lp:~elachuni/ubuntu-webcatalog/configglue-1.0 into lp:ubuntu-webcatalog

[Anthony Lenton]

Migrated to configglue 1.0.

The last of our services that is missing to migrate to configglue 1.0.
The changes in this branch are along the same lines as thos applied for rnr-server on
https://code.launchpad.net/~elachuni/rnr-server/configglue-1.0/+merge/99427
or ubuntu-recommender on
https://code.launchpad.net/~elachuni/ubuntu-recommender/latest-configglue/+merge/95081

[Danny Tamez (zematynnad)]

Looks great Anthony.

review: Approve

[ISD Branch Mangler (isd-branches-mangler)]

Attempt to merge into lp:ubuntu-webcatalog failed due to conflicts:

text conflict in src/webcatalog/schema.py

[ISD Branch Mangler (isd-branches-mangler)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	2012-03-07 22:57:41 +0000
+++ django_project/config/main.cfg	2012-04-18 17:21:19 +0000
@@ -67,11 +67,28 @@
 name = webcatalog.db
 
 [django_logging]
-loggers = django_loggers
 version = 1
-disable_existing_loggers = False
-
-[django_loggers]
+disable_existing_loggers = True
+handlers = django_logging_handlers
+loggers = django_logging_loggers
+root = django_logging_root
+
+[django_logging_root]
+level = WARNING
+
+[django_logging_loggers]
+django = django_logger
+
+[django_logger]
+handlers = null
+level = WARNING
+
+[django_logging_handlers]
+null = django_null_logging_handler
+
+[django_null_logging_handler]
+level = WARNING
+class = django.utils.log.NullHandler
 
 [openid]
 openid_sso_server_url = https://login.staging.ubuntu.com

=== modified file 'django_project/settings.py'
--- django_project/settings.py	2011-06-18 22:24:08 +0000
+++ django_project/settings.py	2012-04-18 17:21:19 +0000
@@ -2,23 +2,15 @@
 
 import os.path
 
-from configglue.pyschema import SchemaConfigParser
-from django_configglue.utils import update_settings
-
+from django_configglue.utils import configglue
 from webcatalog.schema import WebCatalogSchema
 
 
 # get absolute path for config files
 current_dir = os.path.dirname(os.path.abspath(__file__))
-config_files = map(lambda x: os.path.join(current_dir, x),
+config_files = [path for path in map(lambda x: os.path.join(current_dir, x),
                    ['config/main.cfg', '../../local_config/local.cfg',
                     'local.cfg'])
-
-# parse config files
-parser = SchemaConfigParser(WebCatalogSchema())
-parser.read(config_files)
-update_settings(parser, locals())
-
-# keep parser reference
-__CONFIGGLUE_PARSER__ = parser
-
+                if os.path.exists(path)]
+
+configglue(WebCatalogSchema, config_files, __name__)
\ No newline at end of file

=== modified file 'setup.py'
--- setup.py	2012-04-17 04:44:33 +0000
+++ setup.py	2012-04-18 17:21:19 +0000
@@ -36,8 +36,8 @@
         'django',
         'setuptools',
         'south==0.7.3',
-        'configglue==0.10',
-        'django-configglue==0.4',
+        'configglue==1.0.1',
+        'django-configglue==0.6.1',
         'django-openid-auth==0.2',
         'django-piston==0.2.3',
         'django-preflight',

=== modified file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py	2012-04-05 01:09:37 +0000
+++ src/webcatalog/schema.py	2012-04-18 17:21:19 +0000
@@ -17,80 +17,75 @@
 
 """configglue schema for the Apps Directory."""
 
-from configglue.pyschema import ConfigSection
-from configglue.pyschema.options import (
-    BoolConfigOption,
-    DictConfigOption,
-    IntConfigOption,
-    LinesConfigOption,
-    StringConfigOption,
-    )
+
+import django
+from configglue import schema
 from django_configglue.schema import schemas
 
-DjangoSchema = schemas.get('1.3')
+DjangoSchema = schemas.get(django.get_version())
 
 
 class WebCatalogSchema(DjangoSchema):
     """Config options specific to the web catalog."""
     # default section
-    extra_pythonpath = LinesConfigOption(item=StringConfigOption())
-    pgconnect_timeout = IntConfigOption(default=10)
-    should_serve_https = BoolConfigOption()
+    extra_pythonpath = schema.ListOption(item=schema.StringOption())
+    pgconnect_timeout = schema.IntOption(default=10)
+    should_serve_https = schema.BoolOption()
 
-    oops = ConfigSection()
-    oops.oops_dir = StringConfigOption(help='Absolute path to the directory'
+    class oops(schema.Section):
+        oops_dir = schema.StringOption(help='Absolute path to the directory'
             ' oops reports will be stored in')
 
-    openid = ConfigSection()
-    openid.openid_sso_server_url = StringConfigOption()
-    openid.openid_create_users = BoolConfigOption()
-    openid.openid_update_details_from_sreg = BoolConfigOption()
-    openid.openid_launchpad_teams_mapping = DictConfigOption()
-    openid.openid_sreg_extra_fields = LinesConfigOption(
-        item=StringConfigOption())
-    openid.openid_launchpad_staff_teams = LinesConfigOption(
-        item=StringConfigOption())
-
-    webcatalog = ConfigSection()
-    webcatalog.serve_site_media = BoolConfigOption(default=True)
-    webcatalog.sca_api_url = StringConfigOption()
-    webcatalog.disk_apt_cache_location = StringConfigOption()
-    webcatalog.default_distro = StringConfigOption()
-    webcatalog.page_batch_size = IntConfigOption(default=20)
-    webcatalog.preload_api_service_roots = BoolConfigOption()
-    webcatalog.oauth_data_store = StringConfigOption(
-        default='webcatalog.models.oauthtoken.DataStore')
-    webcatalog.convoy_root = StringConfigOption()
-    webcatalog.featured_apps = LinesConfigOption(item=StringConfigOption(),
-        default=[])
-    webcatalog.number_top_rated_apps = IntConfigOption(default=18)
-    webcatalog.screenshots_base_url = StringConfigOption(
-        default='http://screenshots.ubuntu.com/')
-
-    google = ConfigSection()
-    google.google_analytics_id = StringConfigOption()
-    google.secondary_google_analytics_id = StringConfigOption()
-
-    logging = ConfigSection()
-    logging.webapp_logging_config = StringConfigOption()
+    class openid(schema.Section):
+        openid_sso_server_url = schema.StringOption()
+        openid_create_users = schema.BoolOption()
+        openid_update_details_from_sreg = schema.BoolOption()
+        openid_launchpad_teams_mapping = schema.DictOption()
+        openid_sreg_extra_fields = schema.ListOption(
+            item=schema.StringOption())
+        openid_launchpad_staff_teams = schema.ListOption(
+            item=schema.StringOption())
+
+    class webcatalog(schema.Section):
+        serve_site_media = schema.BoolOption(default=True)
+        sca_api_url = schema.StringOption()
+        disk_apt_cache_location = schema.StringOption()
+        default_distro = schema.StringOption()
+        page_batch_size = schema.IntOption(default=20)
+        preload_api_service_roots = schema.BoolOption()
+        oauth_data_store = schema.StringOption(
+            default='webcatalog.models.oauthtoken.DataStore')
+        convoy_root = schema.StringOption()
+        featured_apps = schema.ListOption(item=schema.StringOption(),
+            default=[])
+        number_top_rated_apps = schema.IntOption(default=8)
+        screenshots_base_url = schema.StringOption(
+            default='http://screenshots.ubuntu.com/')
+
+    class google(schema.Section):
+        google_analytics_id = schema.StringOption()
+        secondary_google_analytics_id = schema.StringOption()
+
+    class logging(schema.Section):
+        webapp_logging_config = schema.StringOption()
 
     # preflight
-    preflight = ConfigSection()
-    preflight.preflight_base_template = StringConfigOption(
-        default="webcatalog/base.html")
-
-    rnr = ConfigSection()
-    rnr.rnr_service_root = StringConfigOption(
-        default="http://reviews.ubuntu.com/reviews/api/1.0")
-    rnr.reviews_cache_timeout = IntConfigOption(default=60 * 15)
-
-    sso_api = ConfigSection()
-    sso_api.sso_api_service_root = StringConfigOption()
-    sso_api.sso_api_auth_username = StringConfigOption()
-    sso_api.sso_api_auth_password = StringConfigOption()
-    sso_api.sso_api_identity_prefix = StringConfigOption()
-    sso_api.sso_auth_mode_no_ubuntu_sso_plaintext_only = BoolConfigOption()
-    sso_api.token_cache_expiry_hours = IntConfigOption(default=4)
-
-    email = ConfigSection()
-    email.noreply_from_address = StringConfigOption()
+    class preflight(schema.Section):
+        preflight_base_template = schema.StringOption(
+            default="webcatalog/base.html")
+
+    class rnr(schema.Section):
+        rnr_service_root = schema.StringOption(
+            default="http://reviews.ubuntu.com/reviews/api/1.0")
+        reviews_cache_timeout = schema.IntOption(default=60 * 15)
+
+    class sso_api(schema.Section):
+        sso_api_service_root = schema.StringOption()
+        sso_api_auth_username = schema.StringOption()
+        sso_api_auth_password = schema.StringOption()
+        sso_api_identity_prefix = schema.StringOption()
+        sso_auth_mode_no_ubuntu_sso_plaintext_only = schema.BoolOption()
+        token_cache_expiry_hours = schema.IntOption(default=4)
+
+    class email(schema.Section):
+        noreply_from_address = schema.StringOption()