launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #11134
[Merge] lp:~benji/python-pgbouncer/tidy-up-dependencies into lp:python-pgbouncer
Benji York has proposed merging lp:~benji/python-pgbouncer/tidy-up-dependencies into lp:python-pgbouncer.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~benji/python-pgbouncer/tidy-up-dependencies/+merge/120426
This branch extracts the non-controversial bits of lp:~benji/python-pgbouncer/buildout-fixes-and-tweaks so we can get them landed.
- fix a bad (not publicly available) version
- add missing psycopg2 dependency
--
https://code.launchpad.net/~benji/python-pgbouncer/tidy-up-dependencies/+merge/120426
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~benji/python-pgbouncer/tidy-up-dependencies into lp:python-pgbouncer.
=== modified file 'buildout.cfg'
--- buildout.cfg 2011-07-18 03:31:27 +0000
+++ buildout.cfg 2012-08-20 16:30:49 +0000
@@ -26,9 +26,6 @@
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-20 16:30:49 +0000
@@ -39,6 +39,7 @@
],
install_requires = [
'fixtures',
+ 'psycopg2',
],
extras_require = dict(
test=[
=== modified file 'versions.cfg'
--- versions.cfg 2011-07-18 03:31:27 +0000
+++ versions.cfg 2012-08-20 16:30:49 +0000
@@ -3,12 +3,13 @@
[versions]
fixtures = 0.3.6
-pytz = 2010o
+psycopg2 = 2.4.5
+pytz = 2012d
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