Merge lp:~elachuni/ubuntu-recommender/latest-configglue into lp:ubuntu-recommender

[Anthony Lenton]

Moved over to configglue 1.0.1.

This branch moves us over to configglue 1.0.1.

Proper logging configuration will need to be taken care of in the deployment config branch, together with code for making configglue a source dep.

[James Westby (james-w)]

Post-hoc approval :-)

review: Approve

=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	2012-02-15 14:16:28 +0000
+++ django_project/config/main.cfg	2012-02-29 00:25:23 +0000
@@ -60,9 +60,29 @@
 host = /tmp
 
 [django_logging]
-loggers = django_loggers
-
-[django_loggers]
+version = 1
+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-12-06 15:07:51 +0000
+++ django_project/settings.py	2012-02-29 00:25:23 +0000
@@ -2,7 +2,7 @@
 
 import os.path
 
-from configglue.pyschema import SchemaConfigParser
+from django_configglue.utils import configglue
 from django_configglue.utils import update_settings
 
 from recommender.schema import UbuntuRecommenderSchema
@@ -14,10 +14,4 @@
                    ['config/main.cfg', '../../local_config/local.cfg',
                     '../../../local_config/local.cfg', 'local.cfg'])
 
-# parse config files
-parser = SchemaConfigParser(UbuntuRecommenderSchema())
-parser.read(config_files)
-update_settings(parser, locals())
-
-# keep parser reference
-__CONFIGGLUE_PARSER__ = parser
+configglue(UbuntuRecommenderSchema, config_files, __name__)

=== modified file 'requirements.txt'
--- requirements.txt	2012-02-15 14:09:20 +0000
+++ requirements.txt	2012-02-29 00:25:23 +0000
@@ -1,7 +1,7 @@
-configglue==0.10
+configglue==1.0.1
 coverage
 django==1.3
-django-configglue==0.4
+django-configglue==0.6.1
 -e bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk
 -e bzr+http://bazaar.launchpad.net/~django-openid-auth/django-openid-auth/trunk
 django-piston==0.2.2.1

=== modified file 'src/recommender/schema.py'
--- src/recommender/schema.py	2012-02-17 12:09:00 +0000
+++ src/recommender/schema.py	2012-02-29 00:25:23 +0000
@@ -25,59 +25,52 @@
     ]
 
 import django
-from configglue.pyschema import ConfigSection
-from configglue.pyschema.options import (
-    BoolConfigOption,
-    DictConfigOption,
-    IntConfigOption,
-    LinesConfigOption,
-    StringConfigOption,
-    )
+from configglue import schema
 from django_configglue.schema import schemas
 
 DjangoSchema = schemas.get(django.get_version())
 
 
 class UbuntuRecommenderSchema(DjangoSchema):
-    openid = ConfigSection()
-    openid.openid_sso_server_url = StringConfigOption()
-    openid.openid_create_users = BoolConfigOption()
-    openid.openid_update_details_from_sreg = BoolConfigOption()
-    openid.multilang_op_endpoints = BoolConfigOption()
-    openid.openid_launchpad_teams_mapping = DictConfigOption()
-    openid.openid_sreg_extra_fields = LinesConfigOption(
-        item=StringConfigOption())
-    openid.openid_sreg_required_fields = LinesConfigOption(
-        item=StringConfigOption())
-    openid.openid_launchpad_staff_teams = LinesConfigOption(
-        item=StringConfigOption())
-
-    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()
-
-    recommender = ConfigSection()
-    recommender.oauth_data_store = StringConfigOption()
-    recommender.pgconnect_timeout = IntConfigOption(default=10)
-    recommender.extra_pythonpath = LinesConfigOption(item=StringConfigOption())
-    recommender.use_https = BoolConfigOption()
-    recommender.recommendation_limit = IntConfigOption(default=10)
-    recommender.recommendation_min_rating = IntConfigOption(default=3)
-    recommender.cache_results_seconds = IntConfigOption(default=300)
-    recommender.enable_gzipped_content = BoolConfigOption(default=True)
-
-    preflight = ConfigSection()
-    preflight.preflight_base_template = StringConfigOption(
-        default='preflight/base.html')
-    preflight.preflight_table_class = StringConfigOption(
-        default='listing')
-
-    data_import = ConfigSection()
-    data_import.rnr_api = StringConfigOption(
-        default='https://reviews.ubuntu.com/reviews/api/1.0')
-
-    logging = ConfigSection()
-    logging.webapp_logging_config = StringConfigOption(fatal=True)
+    class openid(schema.Section):
+        openid_sso_server_url = schema.StringOption()
+        openid_create_users = schema.BoolOption()
+        openid_update_details_from_sreg = schema.BoolOption()
+        multilang_op_endpoints = schema.BoolOption()
+        openid_launchpad_teams_mapping = schema.DictOption()
+        openid_sreg_extra_fields = schema.ListOption(
+            item=schema.StringOption())
+        openid_sreg_required_fields = schema.ListOption(
+            item=schema.StringOption())
+        openid_launchpad_staff_teams = schema.ListOption(
+            item=schema.StringOption())
+
+    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()
+
+    class recommender(schema.Section):
+        oauth_data_store = schema.StringOption()
+        pgconnect_timeout = schema.IntOption(default=10)
+        extra_pythonpath = schema.ListOption(item=schema.StringOption())
+        use_https = schema.BoolOption()
+        recommendation_limit = schema.IntOption(default=10)
+        recommendation_min_rating = schema.IntOption(default=3)
+        cache_results_seconds = schema.IntOption(default=300)
+        enable_gzipped_content = schema.BoolOption(default=True)
+
+    class preflight(schema.Section):
+        preflight_base_template = schema.StringOption(
+            default='preflight/base.html')
+        preflight_table_class = schema.StringOption(
+            default='listing')
+
+    class data_import(schema.Section):
+        rnr_api = schema.StringOption(
+            default='https://reviews.ubuntu.com/reviews/api/1.0')
+
+    class logging(schema.Section):
+        webapp_logging_config = schema.StringOption(fatal=True)