Merge lp:~canonical-isd-hackers/django-pgtools/fix-autocommit-errors into lp:django-pgtools

[Łukasz Czyżykowski]

Fix autocommit errors

Overview
========
This branch fixes failing jenkins errors by pinpointing psycopg2 version to the one which is known to work.

[Michael Nelson (michael.nelson)]

{{{
13:25 < noodles> lukasz: that depends line doesn't make sense to me?
13:26 < lukasz> noodles, use version less than 2.4.2 or version greater than 2.4.2
13:26 < lukasz> which excluded 2.4.2
13:27 < noodles> 2.4.2~ubuntu1 or 2.4.2+ubuntu1?
13:27 < lukasz> noodles, nope, >> and << looks only on version part
13:27 < lukasz> without tags and ubuntu/debian versions
13:27 < noodles> Ah, great.
13:27 < lukasz> 2.4.1 and 2.4.3
13:30 < noodles> lukasz: one last question, why >> 2.4.2? Has the issue in 2.4.1 been fixed then?
13:31 < lukasz> noodles, that's being hopeful :)
13:31 < lukasz> and the issue is in 2.4.2
13:31 < lukasz> 2.4.1 is working
13:31 < noodles> In which case, why not just require 2.4.1 for the moment?
13:31 < lukasz> because lucid doesn't have 2.4.1
13:31 < lukasz> nor natty has
13:32 < noodles> Sorry, why not just require << 2.4.2 for the moment?
13:32 < lukasz> ok
13:33 < lukasz> noodles, pushed

}}}

review: Approve

[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 'debian/control'
--- debian/control	2011-05-30 14:30:10 +0000
+++ debian/control	2011-06-21 11:33:34 +0000
@@ -14,7 +14,7 @@
 XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends}, ${python:Depends},
  python-django (>= 1.0.2),
- python-psycopg2
+ python-psycopg2 (<< 2.4.2)
 Description: Set of Django commands for managing PostgreSQL users.
  Set of Django management commands for handling various aspects of managing
  PostgreSQL database. Most important of which is ability to create database

=== modified file 'tox.ini'
--- tox.ini	2011-05-30 14:30:10 +0000
+++ tox.ini	2011-06-21 11:33:34 +0000
@@ -12,73 +12,73 @@
 [testenv:py2.5-django1.2]
 basepython = python2.5
 deps = django >= 1.2, < 1.3
-       psycopg2
+       psycopg2==2.4.1
        mock
 
 [testenv:py2.5-django1.1]
 basepython = python2.5
 deps = django >= 1.1, < 1.2
-       psycopg2
+       psycopg2==2.4.1
        mock
 
 [testenv:py2.5-django1.0]
 basetpython = python2.5
 deps = django >= 1.0, < 1.1
-       psycopg2
+       psycopg2==2.4.1
        mock
 
 [testenv:py2.5-django1.3]
 basepython = python2.5
 deps = django >= 1.3, < 1.4
-       psycopg2
+       psycopg2==2.4.1
        mock
 
 # Python 2.6
 [testenv:py2.6-django1.2]
 basepython = python2.6
 deps = django >= 1.2, < 1.3
-       psycopg2
+       psycopg2==2.4.1
        mock
 
 [testenv:py2.6-django1.1]
 basepython = python2.6
 deps = django >= 1.1, < 1.2
-       psycopg2
+       psycopg2==2.4.1
        mock
 
 [testenv:py2.6-django1.0]
 basetpython = python2.6
 deps = django >= 1.0, < 1.1
-       psycopg2
+       psycopg2==2.4.1
        mock
 
 [testenv:py2.6-django1.3]
 basepython = python2.6
 deps = django >= 1.3, < 1.4
-       psycopg2
+       psycopg2==2.4.1
        mock
 
 # Python 2.7
 [testenv:py2.7-django1.2]
 basepython = python2.7
 deps = django >= 1.2, < 1.3
-       psycopg2
+       psycopg2==2.4.1
        mock
 
 [testenv:py2.7-django1.1]
 basepython = python2.7
 deps = django >= 1.1, < 1.2
-       psycopg2
+       psycopg2==2.4.1
        mock
 
 [testenv:py2.7-django1.0]
 basetpython = python2.7
 deps = django >= 1.0, < 1.1
-       psycopg2
+       psycopg2==2.4.1
        mock
 
 [testenv:py2.7-django1.3]
 basepython = python2.7
 deps = django >= 1.3, < 1.4
-       psycopg2
+       psycopg2==2.4.1
        mock