launchpad-reviewers team mailing list archive

[Benji York <benji@xxxxxxxxxxxxx>]

Benji York has proposed merging lp:~benji/python-pgbouncer/buildout-fixes-and-tweaks into lp:python-pgbouncer with lp:~benji/python-pgbouncer/longer-timeouts as a prerequisite.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~benji/python-pgbouncer/buildout-fixes-and-tweaks/+merge/119188

This branch tweaks the buildout configuration thusly:

- fix a bad (not publicly available) version
- add missing psycopg2 dependency
- remove references to non-existent eggs and download cache directories (the user can specify them in their ~/.buildout/default.cfg if they want inter-project shared eggs and cache directories)
-- 
https://code.launchpad.net/~benji/python-pgbouncer/buildout-fixes-and-tweaks/+merge/119188
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~benji/python-pgbouncer/buildout-fixes-and-tweaks into lp:python-pgbouncer.

=== modified file 'buildout.cfg'
--- buildout.cfg	2011-07-18 03:31:27 +0000
+++ buildout.cfg	2012-08-10 20:41:21 +0000
@@ -1,34 +1,23 @@
-# Copyright 2011 Canonical Ltd.  This software is licensed under the
+
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 [buildout]
 parts =
     scripts
 unzip = true
-eggs-directory = eggs
-download-cache = download-cache
 relative-paths = true
 
-# Disable this option temporarily if you want buildout to find software
-# dependencies *other* than those in our download-cache.  Once you have the
-# desired software, reenable this option (and check in the new software to
-# lp:lp-source-dependencies if this is going to be reviewed/merged/deployed.)
-install-from-cache = true
+# This will need to be temporarily disabled or changed for package upgrades.
+# Newly-added dependencies should also add their desired version number to
+# versions.cfg.
+allow-picked-versions = false
 
-# This also will need to be temporarily disabled or changed for package
-# upgrades.  Newly-added packages should also add their desired version number
-# to versions.cfg.
 extends = versions.cfg
 
-allow-picked-versions = false
-
 prefer-final = true
 
 develop = .
 
-# [configuration]
-# instance_name = development
-
 [scripts]
 recipe = z3c.recipe.scripts
 eggs = pgbouncer [test]

=== modified file 'setup.py'
--- setup.py	2011-10-28 11:48:53 +0000
+++ setup.py	2012-08-10 20:41:21 +0000
@@ -42,6 +42,7 @@
           ],
       extras_require = dict(
           test=[
+              'psycopg2',
               'testtools',
               'van.pg',
               ]

=== modified file 'versions.cfg'
--- versions.cfg	2011-07-18 03:31:27 +0000
+++ versions.cfg	2012-08-10 20:41:21 +0000
@@ -3,12 +3,13 @@
 
 [versions]
 fixtures = 0.3.6
+psycopg2 = 2.4.5
 pytz = 2010o
 setuptools = 0.6c11
-testresources = 0.2.4-r58
+testresources = 0.2.4
 testtools = 0.9.11
 van.pg = 1.4
-zc.recipe.egg = 1.3.2
 z3c.recipe.filetemplate = 2.1.0
 z3c.recipe.scripts = 1.0.1
 zc.buildout = 1.5.1
+zc.recipe.egg = 1.3.2