Merge lp:~elachuni/rnr-server/configglue-1.0 into lp:rnr-server

[Anthony Lenton]

Updated to configglue 1.0.1

This branch switches rnr-server to use the latest configglue 1.0.1.
Deploying thins branch will require pulling in configglue from a branch, until all co-hosted services are upgraded.

While I was there I updated the pep8-test to work with the latest pep8 0.7.0 that was released today (that added "max_line_length" to the list of options), and fixed a middleware test.

[lp:~elachuni/rnr-server/configglue-1.0]

215. By Anthony Lenton on 2012-03-26

Upgraded configglue to 1.0.1

=== modified file 'django_project/config_dev/settings.py'
--- django_project/config_dev/settings.py	2011-07-06 20:00:34 +0000
+++ django_project/config_dev/settings.py	2012-03-26 21:47:20 +0000
@@ -1,29 +1,19 @@
 import logging.config
 import os.path
 
-try:
-    from configglue.pyschema import SchemaConfigParser
-except ImportError:
-    from configglue.pyschema.parser import SchemaConfigParser
-
-from django_configglue.utils import update_settings, SETTINGS_ENCODING
+from django_configglue.utils import configglue
 
 from reviewsapp.schema import RnRSchema
 
 
 # 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(RnRSchema())
-parser.read(config_files)
-update_settings(parser, locals())
-
-# keep parser reference
-__CONFIGGLUE_PARSER__ = parser
+                if os.path.exists(path)]
+
+configglue(RnRSchema, config_files, __name__)
 
 if 'LOGGING_CONFIG_FILE' in locals():
     logging.config.fileConfig(os.path.join(current_dir, LOGGING_CONFIG_FILE))

=== modified file 'requirements.txt'
--- requirements.txt	2012-02-06 15:38:27 +0000
+++ requirements.txt	2012-03-26 21:47:20 +0000
@@ -1,8 +1,8 @@
 -f https://launchpad.net/launchpadlib/+download?start=10
-configglue==0.10
+configglue==1.0.1
 coverage
 django==1.3
-django-configglue==0.4
+django-configglue==0.6.1
 django-openid-auth==0.2
 django-piston
 python-openid

=== modified file 'setup.py'
--- setup.py	2011-09-21 20:41:33 +0000
+++ setup.py	2012-03-26 21:47:20 +0000
@@ -18,8 +18,8 @@
         'django',
         'django-openid-auth==0.2',
         'django-piston',
-        'configglue==0.10',
-        'django-configglue==0.4',
+        'configglue==1.0.1',
+        'django-configglue==0.6.1',
         'python-openid',
         'south==0.7',
         'launchpadlib==1.6.0',

=== modified file 'src/reviewsapp/schema.py'
--- src/reviewsapp/schema.py	2012-03-21 22:05:09 +0000
+++ src/reviewsapp/schema.py	2012-03-26 21:47:20 +0000
@@ -1,19 +1,30 @@
+#   This file is part of Software Center Ratings and Reviews
+#   Copyright (C) 2010 Canonical Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Configuration schema declaration."""
+
+from __future__ import absolute_import
+
+__metaclass__ = type
+__all__ = [
+    'RnRSchema',
+    ]
+
 import django
-
-# This conditional import is to support reorganization of the code in latest
-# configglue branch (the one required by django-configglue trunk).
-try:
-    from configglue.pyschema import ConfigSection
-    from configglue.pyschema.options import (
-        BoolConfigOption, DictConfigOption,
-        IntConfigOption, LinesConfigOption, StringConfigOption
-    )
-except ImportError:
-    from configglue.pyschema.schema import (
-        ConfigSection, BoolConfigOption, DictConfigOption, IntConfigOption,
-        LinesConfigOption, StringConfigOption
-    )
-
+from configglue import schema
 from django_configglue.schema import schemas
 
 DjangoSchema = schemas.get(django.get_version())
@@ -21,83 +32,83 @@
 
 class RnRSchema(DjangoSchema):
     # default
-    pgconnect_timeout = IntConfigOption(default=10)
-    serve_static_media = BoolConfigOption()
-    extra_pythonpath = LinesConfigOption(item=StringConfigOption())
-    default_timeout = IntConfigOption(default=None)
-    soft_request_timeout = IntConfigOption(default=20)
+    pgconnect_timeout = schema.IntOption(default=10)
+    serve_static_media = schema.BoolOption()
+    extra_pythonpath = schema.ListOption(item=schema.StringOption())
+    default_timeout = schema.IntOption(default=None)
+    soft_request_timeout = schema.IntOption(default=20)
 
     # openid
-    openid = ConfigSection()
-    openid.openid_create_users = BoolConfigOption()
-    openid.openid_reuse_users = BoolConfigOption()
-    openid.openid_launchpad_teams_mapping = DictConfigOption()
-    openid.openid_sso_server_url = StringConfigOption()
-    openid.openid_set_language_from_sreg = BoolConfigOption()
-    openid.openid_update_details_from_sreg = BoolConfigOption()
-    openid.openid_sreg_extra_fields = LinesConfigOption(
-        item=StringConfigOption())
-    openid.openid_sreg_required_fields = LinesConfigOption(
-        item=StringConfigOption())
-    openid.openid_launchpad_staff_teams = LinesConfigOption(
-        item=StringConfigOption())
+    class openid(schema.Section):
+        openid_create_users = schema.BoolOption()
+        openid_reuse_users = schema.BoolOption()
+        openid_launchpad_teams_mapping = schema.DictOption()
+        openid_sso_server_url = schema.StringOption()
+        openid_set_language_from_sreg = schema.BoolOption()
+        openid_update_details_from_sreg = schema.BoolOption()
+        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())
 
     # logging
-    logging = ConfigSection()
-    logging.oops_dir = StringConfigOption(help='Absolute path to the'
-        'directory oops reports will be stored in')
-    logging.logging_config_file = StringConfigOption(fatal=True)
+    class logging(schema.Section):
+        oops_dir = schema.StringOption(help='Absolute path to the'
+            'directory oops reports will be stored in')
+        logging_config_file = schema.StringOption(fatal=True)
 
     # loadtest
-    loadtest = ConfigSection()
-    loadtest.enable_statistics_logging = BoolConfigOption()
-    loadtest.network_interfaces = LinesConfigOption(item=StringConfigOption())
-    loadtest.disks = LinesConfigOption(item=StringConfigOption())
-    loadtest.seconds_between_logging = IntConfigOption(default=5)
-    loadtest.stats_to_log = LinesConfigOption(item=StringConfigOption())
+    class loadtest(schema.Section):
+        enable_statistics_logging = schema.BoolOption()
+        network_interfaces = schema.ListOption(
+            item=schema.StringOption())
+        disks = schema.ListOption(item=schema.StringOption())
+        seconds_between_logging = schema.IntOption(default=5)
+        stats_to_log = schema.ListOption(item=schema.StringOption())
 
     # SSO API
-    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()
+    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()
 
     # RnR
-    rnr = ConfigSection()
-    rnr.moderators_group = StringConfigOption()
-    rnr.preload_api_service_roots = BoolConfigOption()
-    rnr.api_reviews_pagination = IntConfigOption()
-    rnr.cache_review_stats_seconds = IntConfigOption()
-    rnr.token_cache_expiry_hours = IntConfigOption(default=4)
-    rnr.reviewsapp_media_root = StringConfigOption()
-    rnr.force_https_in_environment = BoolConfigOption()
-    rnr.allow_multiple_reviews_for_testing = BoolConfigOption(default=False)
-    rnr.enable_artificial_oops = BoolConfigOption()
-    rnr.modify_window_minutes = IntConfigOption()
-    rnr.enable_gzip_content = BoolConfigOption(default=True)
-    rnr.enable_histogram_data = BoolConfigOption(default=True)
+    class rnr(schema.Section):
+        moderators_group = schema.StringOption()
+        preload_api_service_roots = schema.BoolOption()
+        api_reviews_pagination = schema.IntOption()
+        cache_review_stats_seconds = schema.IntOption()
+        token_cache_expiry_hours = schema.IntOption(default=4)
+        reviewsapp_media_root = schema.StringOption()
+        force_https_in_environment = schema.BoolOption()
+        allow_multiple_reviews_for_testing = schema.BoolOption(default=False)
+        enable_artificial_oops = schema.BoolOption()
+        modify_window_minutes = schema.IntOption()
+        enable_gzip_content = schema.BoolOption(default=True)
+        enable_histogram_data = schema.BoolOption(default=True)
 
     # Launchpad
-    launchpad = ConfigSection()
-    launchpad.lp_service = StringConfigOption()
-    launchpad.lp_consumer_name = StringConfigOption()
-    launchpad.launchpadlib_dir = StringConfigOption(
-        default='/tmp/.launchpadlib')
+    class launchpad(schema.Section):
+        lp_service = schema.StringOption()
+        lp_consumer_name = schema.StringOption()
+        launchpadlib_dir = schema.StringOption(default='/tmp/.launchpadlib')
 
     # Piston
-    piston = ConfigSection()
-    piston.oauth_data_store = StringConfigOption()
+    class piston(schema.Section):
+        oauth_data_store = schema.StringOption()
 
     # Softwarecenter agent.
-    sca = ConfigSection()
-    sca.sca_host_url = StringConfigOption(
-        default='https://software-center.ubuntu.com/')
-    sca.sca_apps_cache_timeout = IntConfigOption(default=3600)
+    class sca(schema.Section):
+        sca_host_url = schema.StringOption(
+            default='https://software-center.ubuntu.com/')
+        sca_apps_cache_timeout = schema.IntOption(default=3600)
 
     # preflight
-    preflight = ConfigSection()
-    preflight.preflight_base_template = StringConfigOption(
-        default="light/index.1col.html")
-    preflight.preflight_table_class = StringConfigOption(default="listing")
+    class preflight(schema.Section):
+        preflight_base_template = schema.StringOption(
+            default="light/index.1col.html")
+        preflight_table_class = schema.StringOption(default="listing")

=== modified file 'src/reviewsapp/tests/test_middleware.py'
--- src/reviewsapp/tests/test_middleware.py	2012-03-21 22:05:09 +0000
+++ src/reviewsapp/tests/test_middleware.py	2012-03-26 21:47:20 +0000
@@ -35,6 +35,7 @@
 from django.test import TestCase
 from mock import patch, MagicMock, Mock
 
+import reviewsapp.urls
 from reviewsapp.middleware.stats import StatisticsLoggingMiddleware
 from reviewsapp.middleware.exception import (
     LogExceptionMiddleware,
@@ -306,6 +307,8 @@
         # soft_request_timeout is an IntConfigOption, but a float works too
         with patch_settings(ENABLE_ARTIFICIAL_OOPS=True,
                             SOFT_REQUEST_TIMEOUT=0.1):
+            reload(reviewsapp.urls)
             response = self.client.get('/reviews/delay/0.1/')
 
+        reload(reviewsapp.urls)
         self.assertTrue('dump-oops' in environ)

=== modified file 'src/reviewsapp/tests/test_pep8.py'
--- src/reviewsapp/tests/test_pep8.py	2012-01-26 14:10:00 +0000
+++ src/reviewsapp/tests/test_pep8.py	2012-03-26 21:47:20 +0000
@@ -56,6 +56,7 @@
             show_pep8 = False
             select = []
             ignore = []
+            max_line_length = 79
         pep8.options = Options()
         pep8.message = self.message
         Options.physical_checks = pep8.find_checks('physical_line')