Merge lp:~canonical-isd-hackers/django-preflight/py2.5-support into lp:django-preflight

[Łukasz Czyżykowski]

Add support for Python 2.5, which required small code change.

Additionally added tox script which will bootstrap and execute tests in all environments without any setup necessary.

[lp:~canonical-isd-hackers/django-preflight/py2.5-support]

13. By Łukasz Czyżykowski on 2011-02-11

Fixed overstatement in compatibility note.

[Anthony Lenton (elachuni)]

Impressive :)

review: Approve

=== modified file 'README'
--- README	2011-02-08 16:23:25 +0000
+++ README	2011-02-11 10:56:29 +0000
@@ -23,3 +23,13 @@
 specific bits of information.
 
 More information can be found in ``doc/`` directory.
+
+
+Testing
+=======
+
+To run tests just invoke tox_ command. If you don't have it installed
+you can use supplied ``tox`` script which will pull it automatically
+and then run the whole test suite.
+
+.. _tox: http://codespeak.net/tox/

=== modified file 'doc/install.rst'
--- doc/install.rst	2011-02-09 16:49:51 +0000
+++ doc/install.rst	2011-02-11 10:56:29 +0000
@@ -73,3 +73,15 @@
 ``preflight.py`` modules in all installed applications. Similar to
 Django's admin ``admin.autodiscover()`` call.  This enables you to
 just drop such file into your application folder.
+
+
+Compatibility
+-------------
+
+django-preflight is compatible with released Django versions since
+1.0, as well as with upcoming 1.3. To be sure about this it's tested
+using tox_ against all of them.
+
+Additionally it's tested on Python 2.5, 2.6 and 2.7, all on Ubuntu Linux.
+
+.. _tox: http://codespeak.net/tox/

=== modified file 'preflight/management/commands/preflight.py'
--- preflight/management/commands/preflight.py	2011-02-07 16:06:51 +0000
+++ preflight/management/commands/preflight.py	2011-02-11 10:56:29 +0000
@@ -48,8 +48,6 @@
             self.stdout.write(app_style(application.name) + '\n')
             self.stdout.write("-" * columns + '\n')
 
-            line_format = "{0:<{width}} {1:^6}\n"
-
             for check in application.checks:
                 # Formatting check result line, uses ANSI colors to prettify it
                 if check.passed:
@@ -57,8 +55,7 @@
                 else:
                     status_name = error_style("ERROR")
 
-                self.stdout.write(line_format.format(
-                    check.name, status_name, width=(columns - 7)))
+                self.stdout.write(check.name.ljust(columns - 7) + status_name + '\n')
 
         # Report correct return code to the shell
         sys.exit(not all(a.passed for a in applications))

=== modified file 'preflight/models.py'
--- preflight/models.py	2011-02-07 16:06:51 +0000
+++ preflight/models.py	2011-02-11 10:56:29 +0000
@@ -11,7 +11,7 @@
     def __init__(self, class_):
         self.class_ = class_
         self.checks = []
-        self.name = "{0} checks".format(self._application_name())
+        self.name = "%s checks" % self._application_name()
         self._gather_checks()
 
     def _gather_checks(self):

=== added file 'tox'
--- tox	1970-01-01 00:00:00 +0000
+++ tox	2011-02-11 10:56:29 +0000
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+import urllib
+url = "https://pytox.googlecode.com/hg/toxbootstrap.py"
+d = dict(__file__='toxbootstrap.py')
+exec urllib.urlopen(url).read() in d
+d['cmdline'](['--recreate'])
\ No newline at end of file

=== modified file 'tox.ini'
--- tox.ini	2011-02-09 16:26:04 +0000
+++ tox.ini	2011-02-11 10:56:29 +0000
@@ -1,7 +1,8 @@
 [tox]
 envlist = 
-        py26-django124, py26-django113, py26-django104, py26-django-beta,
-        py27-django124, py27-django113, py27-django104, py27-django-beta,
+        py2.5-django1.2, py2.5-django1.1, py2.5-django1.0, py2.5-django1.3-beta,
+        py2.6-django1.2, py2.6-django1.1, py2.6-django1.0, py2.6-django1.3-beta,
+        py2.7-django1.2, py2.7-django1.1, py2.7-django1.0, py2.7-django1.3-beta,
         docs
 
 [testenv]
@@ -15,34 +16,53 @@
     sphinx-build -b doctest -d {envtmpdir}/doctrees . {envtmpdir}/doctest
     sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 
-[testenv:py26-django124]
-basepython = python2.6
-deps = http://www.djangoproject.com/download/1.2.4/tarball/
-
-[testenv:py26-django113]
-basepython = python2.6
-deps = http://www.djangoproject.com/download/1.1.3/tarball/
-
-[testenv:py26-django104]
+# Python 2.5
+[testenv:py2.5-django1.2]
+basepython = python2.5
+deps = django >= 1.2, < 1.3
+
+[testenv:py2.5-django1.1]
+basepython = python2.5
+deps = django >= 1.1, < 1.2
+
+[testenv:py2.5-django1.0]
+basetpython = python2.5
+deps = django >= 1.0, < 1.1
+
+[testenv:py2.5-django1.3-beta]
+basepython = python2.5
+deps = http://www.djangoproject.com/download/1.3-beta-1/tarball/
+
+# Python 2.6
+[testenv:py2.6-django1.2]
+basepython = python2.6
+deps = django >= 1.2, < 1.3
+
+[testenv:py2.6-django1.1]
+basepython = python2.6
+deps = django >= 1.1, < 1.2
+
+[testenv:py2.6-django1.0]
 basetpython = python2.6
-deps = http://www.djangoproject.com/download/1.0.4/tarball/
+deps = django >= 1.0, < 1.1
 
-[testenv:py26-django-beta]
+[testenv:py2.6-django1.3-beta]
 basepython = python2.6
 deps = http://www.djangoproject.com/download/1.3-beta-1/tarball/
 
-[testenv:py27-django124]
-basepython = python2.7
-deps = http://www.djangoproject.com/download/1.2.4/tarball/
-
-[testenv:py27-django113]
-basepython = python2.7
-deps = http://www.djangoproject.com/download/1.1.3/tarball/
-
-[testenv:py27-django104]
+# Python 2.7
+[testenv:py2.7-django1.2]
+basepython = python2.7
+deps = django >= 1.2, < 1.3
+
+[testenv:py2.7-django1.1]
+basepython = python2.7
+deps = django >= 1.1, < 1.2
+
+[testenv:py2.7-django1.0]
 basetpython = python2.7
-deps = http://www.djangoproject.com/download/1.0.4/tarball/
+deps = django >= 1.0, < 1.1
 
-[testenv:py27-django-beta]
+[testenv:py2.7-django1.3-beta]
 basepython = python2.7
 deps = http://www.djangoproject.com/download/1.3-beta-1/tarball/