Merge lp:~ricardokirkner/django-configglue/setup-housekeeping into lp:django-configglue

[Ricardo Kirkner]

added __version__ string

Some improvement to the setup.py script

move the management utility monkeypatch out of the way
add __version__ string
other housekeeping tasks

=== modified file '.bzrignore'
--- .bzrignore	2011-01-10 21:44:26 +0000
+++ .bzrignore	2011-07-10 15:32:50 +0000
@@ -1,2 +1,3 @@
 doc/_build
 django_configglue.egg-info
+*.pyc

=== renamed file 'LICENSE' => 'LICENSE.txt'
=== modified file 'MANIFEST.in'
--- MANIFEST.in	2010-08-11 17:00:02 +0000
+++ MANIFEST.in	2011-07-10 15:32:50 +0000
@@ -1,4 +1,4 @@
-include LICENSE
+include *.py *.txt
 graft testproject
 graft third-party
 global-exclude *.pyc

=== renamed file 'README' => 'README.txt'
=== modified file 'django_configglue/__init__.py'
--- django_configglue/__init__.py	2011-04-09 22:38:14 +0000
+++ django_configglue/__init__.py	2011-07-10 15:32:50 +0000
@@ -1,73 +1,7 @@
-# Copyright 2010 Canonical Ltd.
-# Copyright Django Software Foundation and individual contributors
-# This software is licensed under the
-# GNU Lesser General Public License version 3 (see the file LICENSE)
-# except where third-party/django/LICENSE applies.
-
-import sys
-
-import django
-import django.core.management
-from configglue.pyschema.glue import schemaconfigglue
-from django.core.management import ManagementUtility, LaxOptionParser
-from django.core.management.base import BaseCommand, handle_default_options
-from django.conf import settings
-from django_configglue import utils
-
-
-class GlueManagementUtility(ManagementUtility):
-    # This function was mostly taken from the django project.
-    # Please see the license file in the third-party/django directory.
-    def execute(self):
-        """
-        Given the command-line arguments, this figures out which subcommand is
-        being run, creates a parser appropriate to that command, and runs it.
-        """
-        # Preprocess options to extract --settings and --pythonpath.
-        # These options could affect the commands that are available, so they
-        # must be processed early.
-        parser = LaxOptionParser(usage="%prog subcommand [options] [args]",
-                                 version=django.get_version(),
-                                 option_list=BaseCommand.option_list)
-        try:
-            configglue_parser = settings.__CONFIGGLUE_PARSER__
-            parser, options, args = schemaconfigglue(configglue_parser,
-                op=parser, argv=self.argv)
-            # remove schema-related options from the argv list
-            self.argv = args
-            utils.update_settings(configglue_parser, settings)
-        except AttributeError:
-            # no __CONFIGGLUE_PARSER__ found, fall back to standard django
-            # options parsing
-            options, args = parser.parse_args(self.argv)
-            handle_default_options(options)
-        except:
-            # Ignore any option errors at this point.
-            args = self.argv
-
-        try:
-            subcommand = self.argv[1]
-        except IndexError:
-            sys.stderr.write("Type '%s help' for usage.\n" % self.prog_name)
-            sys.exit(1)
-
-        if subcommand == 'help':
-            if len(args) > 2:
-                self.fetch_command(args[2]).print_help(self.prog_name, args[2])
-            else:
-                parser.print_lax_help()
-                sys.stderr.write(self.main_help_text() + '\n')
-                sys.exit(1)
-        # Special-cases: We want 'django-admin.py --version' and
-        # 'django-admin.py --help' to work, for backwards compatibility.
-        elif self.argv[1:] == ['--version']:
-            # LaxOptionParser already takes care of printing the version.
-            pass
-        elif self.argv[1:] == ['--help']:
-            parser.print_lax_help()
-            sys.stderr.write(self.main_help_text() + '\n')
-        else:
-            self.fetch_command(subcommand).run_from_argv(self.argv)
-
-# We're going to go ahead and use our own ManagementUtility here, thank you.
-django.core.management.ManagementUtility = GlueManagementUtility
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Lesser General Public License version 3 (see the file LICENSE).
+
+__version__ = '0.5'
+
+# monkey-patch django's management utility
+from . import management

=== modified file 'django_configglue/management/__init__.py'
--- django_configglue/management/__init__.py	2010-07-23 19:27:51 +0000
+++ django_configglue/management/__init__.py	2011-07-10 15:32:50 +0000
@@ -1,3 +1,75 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Lesser General Public License version 3 (see the file LICENSE).
-
+# Copyright 2010 Canonical Ltd.
+# Copyright Django Software Foundation and individual contributors
+# This software is licensed under the
+# GNU Lesser General Public License version 3 (see the file LICENSE)
+# except where third-party/django/LICENSE applies.
+
+
+import sys
+
+import django
+import django.core.management
+from configglue.pyschema.glue import schemaconfigglue
+from django.core.management import ManagementUtility, LaxOptionParser
+from django.core.management.base import BaseCommand, handle_default_options
+from django.conf import settings
+from django_configglue import utils
+
+
+class GlueManagementUtility(ManagementUtility):
+    # This function was mostly taken from the django project.
+    # Please see the license file in the third-party/django directory.
+    def execute(self):
+        """
+        Given the command-line arguments, this figures out which subcommand is
+        being run, creates a parser appropriate to that command, and runs it.
+        """
+        # Preprocess options to extract --settings and --pythonpath.
+        # These options could affect the commands that are available, so they
+        # must be processed early.
+        parser = LaxOptionParser(usage="%prog subcommand [options] [args]",
+                                 version=django.get_version(),
+                                 option_list=BaseCommand.option_list)
+        try:
+            configglue_parser = settings.__CONFIGGLUE_PARSER__
+            parser, options, args = schemaconfigglue(configglue_parser,
+                op=parser, argv=self.argv)
+            # remove schema-related options from the argv list
+            self.argv = args
+            utils.update_settings(configglue_parser, settings)
+        except AttributeError:
+            # no __CONFIGGLUE_PARSER__ found, fall back to standard django
+            # options parsing
+            options, args = parser.parse_args(self.argv)
+            handle_default_options(options)
+        except:
+            # Ignore any option errors at this point.
+            args = self.argv
+
+        try:
+            subcommand = self.argv[1]
+        except IndexError:
+            sys.stderr.write("Type '%s help' for usage.\n" % self.prog_name)
+            sys.exit(1)
+
+        if subcommand == 'help':
+            if len(args) > 2:
+                self.fetch_command(args[2]).print_help(self.prog_name, args[2])
+            else:
+                parser.print_lax_help()
+                sys.stderr.write(self.main_help_text() + '\n')
+                sys.exit(1)
+        # Special-cases: We want 'django-admin.py --version' and
+        # 'django-admin.py --help' to work, for backwards compatibility.
+        elif self.argv[1:] == ['--version']:
+            # LaxOptionParser already takes care of printing the version.
+            pass
+        elif self.argv[1:] == ['--help']:
+            parser.print_lax_help()
+            sys.stderr.write(self.main_help_text() + '\n')
+        else:
+            self.fetch_command(subcommand).run_from_argv(self.argv)
+
+
+# We're going to go ahead and use our own ManagementUtility here, thank you.
+django.core.management.ManagementUtility = GlueManagementUtility

=== modified file 'django_configglue/tests/test_configglue.py'
--- django_configglue/tests/test_configglue.py	2011-06-22 23:06:50 +0000
+++ django_configglue/tests/test_configglue.py	2011-07-10 15:32:50 +0000
@@ -20,7 +20,7 @@
 from django.conf import settings
 from mock import patch
 
-from django_configglue import GlueManagementUtility
+from django_configglue.management import GlueManagementUtility
 from django_configglue.utils import (
     SETTINGS_ENCODING,
     configglue,

=== modified file 'setup.py'
--- setup.py	2011-06-24 18:18:25 +0000
+++ setup.py	2011-07-10 15:32:50 +0000
@@ -3,12 +3,15 @@
 
 from setuptools import setup, find_packages
 
+from setup_helpers import get_version
+
+
 setup(
     # metadata
     name='django-configglue',
-    version='0.5',
-    author='Canonical ISD Hackers',
-    author_email='[e-mail]',
+    version=get_version('django_configglue/__init__.py'),
+    author='Ricardo Kirkner',
+    author_email='[e-mail]',
     description='Django commands for managing configglue generated settings',
     long_description='Django commands for managing configglue generated '
         'settings from the command line.\n'

=== added file 'setup_helpers.py'
--- setup_helpers.py	1970-01-01 00:00:00 +0000
+++ setup_helpers.py	2011-07-10 15:32:50 +0000
@@ -0,0 +1,41 @@
+# Copyright 2010-2011 Canonical Ltd.  This software is licensed under the
+# GNU Lesser General Public License version 3 (see the file LICENSE).
+# Copyright 2009-2011 by Barry A. Warsaw
+
+import re
+
+
+DEFAULT_VERSION_RE = re.compile(r'(?P<version>\d+\.\d(?:\.\d+)?)')
+
+
+def get_version(filename, pattern=None):
+    """Extract the __version__ from a file without importing it.
+
+    While you could get the __version__ by importing the module, the very act
+    of importing can cause unintended consequences.  For example, Distribute's
+    automatic 2to3 support will break.  Instead, this searches the file for a
+    line that starts with __version__, and extract the version number by
+    regular expression matching.
+
+    By default, two or three dot-separated digits are recognized, but by
+    passing a pattern parameter, you can recognize just about anything.  Use
+    the `version` group name to specify the match group.
+
+    :param filename: The name of the file to search.
+    :type filename: string
+    :param pattern: Optional alternative regular expression pattern to use.
+    :type pattern: string
+    :return: The version that was extracted.
+    :rtype: string
+    """
+    if pattern is None:
+        cre = DEFAULT_VERSION_RE
+    else:
+        cre = re.compile(pattern)
+    with open(filename) as fp:
+        for line in fp:
+            if line.startswith('__version__'):
+                mo = cre.search(line)
+                assert mo, 'No valid __version__ string found'
+                return mo.group('version')
+    raise AssertionError('No __version__ assignment found')

=== modified file 'tox'
--- tox	2011-04-09 21:52:09 +0000
+++ tox	2011-07-10 15:32:50 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
-import urllib
-url = "https://pytox.googlecode.com/hg/toxbootstrap.py"
+import urllib, os
+url = "https://bitbucket.org/hpk42/tox/raw/default/toxbootstrap.py"
+#os.environ['USETOXDEV']="1"  # use tox dev version
 d = dict(__file__='toxbootstrap.py')
 exec urllib.urlopen(url).read() in d
-d['cmdline'](['--recreate'])
\ No newline at end of file
+d['cmdline'](['--recreate'])