Merge lp:~allenap/python-oops-tools/use-psycopg2-2.4.1 into lp:python-oops-tools

[Gavin Panella]

Mandate psycopg2 2.4.1.

This forces the use of psycopg2 2.4.1 so that environments in Lucid
and Oneiric more closely resemble one another, and to avoid hitting
an incompatibility between Django 1.3 and pyscopg2 2.4.2.

[Diogo Matsubara (matsubara)]

Looks good. Thanks Gavin!

review: Approve

[Launchpad PQM Bot (launchpad-pqm)]

The attempt to merge lp:~allenap/python-oops-tools/use-psycopg2-2.4.1 into lp:python-oops-tools failed.Below is the output from the failed tests.

find . -type f -name '*.py[co]' -exec rm -f {} \;
rm -f bin/buildout
rm -f src/oopstools/settings.py
bzr clean-tree --unknown --force
bzr up download-cache
python bootstrap.py \
  --setup-source=ez_setup.py \
  --download-base=download-cache/dist --eggs=eggs
Download error: [Errno 101] Network is unreachable -- Some packages may not be found!
Download error: [Errno 101] Network is unreachable -- Some packages may not be found!
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/buildout'.
bin/buildout configuration:db-port=5433
Develop: '/home/pqm/pqm-workdir/oops-tools/.'
Getting distribution for 'psycopg2==2.4.1'.
An error occured when trying to install psycopg2 2.4.1.Look above this message for any errors thatwere output by easy_install.

W: line 3 [buildbot-staging]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 1 [pqm]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 2 [pqm-oops-tools]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
I: [pqm-oops-tools chroot] Running command: "cd /home/pqm/pqm-workdir/oops-tools && make check"
Nothing to delete.
+N dist/psycopg2-2.4.1.tar.gz
All changes applied successfully.
Updated to revision 50 of branch http://bazaar.launchpad.net/~launchpad/lazr-source-dependencies/download-cache
Error: pg_config executable not found.

Please add the directory containing pg_config to the PATH
or specify the full executable path with the option:

    python setup.py build_ext --pg-config /path/to/pg_config build ...

or with the pg_config option in 'setup.cfg'.
error: Setup script exited with 1
While:
  Installing.
  Getting section filetemplates.
  Initializing part filetemplates.
  Getting distribution for 'psycopg2==2.4.1'.
Error: Couldn't install: psycopg2 2.4.1
make: *** [bin/buildout] Error 1

[Gavin Panella (allenap)]

I've filed an RT to address the landing issue:

  #49246 libpq-dev needed on python-oops-tools Tarmac chroot
    https://rt.admin.canonical.com//Ticket/Display.html?id=49246

[Launchpad PQM Bot (launchpad-pqm)]

Attempt to merge lp:~allenap/python-oops-tools/use-psycopg2-2.4.1 into lp:python-oops-tools failed due to merge conflicts:

text conflict in versions.cfg

[lp:~allenap/python-oops-tools/use-psycopg2-2.4.1]

21. By Gavin Panella on 2011-11-30

Merge trunk, resolving 1 conflict.

=== modified file 'setup.py'
--- setup.py	2011-11-21 03:42:03 +0000
+++ setup.py	2011-11-30 17:09:25 +0000
@@ -59,6 +59,7 @@
         'oops',
         'oops-amqp',
         'oops-datedir-repo',
+        'psycopg2',
         'pytz',
         'setuptools',
         'South',

=== modified file 'versions.cfg'
--- versions.cfg	2011-11-21 03:42:03 +0000
+++ versions.cfg	2011-11-30 17:09:25 +0000
@@ -22,6 +22,9 @@
 oops = 0.0.10
 oops-amqp = 0.0.4
 oops-datedir-repo = 0.0.14
+# XXX: 2011-11-17 GavinPanella bug=891249: pyscopg2 2.4.2 is
+# incompatible with Django 1.3, but 2.4.1 works fine.
+psycopg2 = 2.4.1
 setuptools = 0.6c11
 z3c.recipe.filetemplate = 2.0.3
 z3c.recipe.sphinxdoc = 0.0.8