diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-01-07 01:32:13 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-01-07 01:32:13 +0000 |
| commit | d67c741ef82c0a14778c691281139ec364c34a27 (patch) | |
| tree | df65c82f285bcf403c40abd0f96352863111f81a | |
| parent | d06cfb3fb19743e9b49534f5d94c0e4568dd6566 (diff) | |
| download | pyramid-d67c741ef82c0a14778c691281139ec364c34a27.tar.gz pyramid-d67c741ef82c0a14778c691281139ec364c34a27.tar.bz2 pyramid-d67c741ef82c0a14778c691281139ec364c34a27.zip | |
Depend on repoze.tm instead of repoze.tm2 (we don't need the extra ``transaction`` egg if we've got the one from ZODB 3.8.1).
Add a closer.
| -rw-r--r-- | repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl | 1 | ||||
| -rw-r--r-- | repoze/bfg/paster_templates/zodb/+project+.ini_tmpl | 3 | ||||
| -rw-r--r-- | repoze/bfg/paster_templates/zodb/setup.py_tmpl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl b/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl index 176b06d51..39a9e76b1 100644 --- a/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl +++ b/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl @@ -1,6 +1,5 @@ from repoze.bfg.router import make_app as bfg_make_app from repoze.bfg.registry import get_options -from repoze.zodbconn.finder import dbfactory_from_uri from repoze.zodbconn.finder import PersistentApplicationFinder def app(global_config, **kw): diff --git a/repoze/bfg/paster_templates/zodb/+project+.ini_tmpl b/repoze/bfg/paster_templates/zodb/+project+.ini_tmpl index 70f69322d..ca6fe99a2 100644 --- a/repoze/bfg/paster_templates/zodb/+project+.ini_tmpl +++ b/repoze/bfg/paster_templates/zodb/+project+.ini_tmpl @@ -10,7 +10,8 @@ zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000 [pipeline:main] pipeline = - egg:repoze.tm2#tm + egg:repoze.zodbconn#closer + egg:repoze.tm#tm zodb [server:main] diff --git a/repoze/bfg/paster_templates/zodb/setup.py_tmpl b/repoze/bfg/paster_templates/zodb/setup.py_tmpl index dd2665e20..6fc85b716 100644 --- a/repoze/bfg/paster_templates/zodb/setup.py_tmpl +++ b/repoze/bfg/paster_templates/zodb/setup.py_tmpl @@ -32,7 +32,7 @@ setup(name='{{project}}', install_requires=[ 'repoze.bfg', 'repoze.zodbconn', - 'repoze.tm2', + 'repoze.tm', 'ZODB3', ], tests_require=[ |