summaryrefslogtreecommitdiff
path: root/docs/quick_tour/sqla_demo/setup.py
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-11-12 12:56:27 -0600
committerMichael Merickel <michael@merickel.org>2015-11-12 12:56:46 -0600
commit414b67b45bab156b9738105e180908c4eee8600a (patch)
tree6a9ee22d939c88f35786da0f06ff32b98102e374 /docs/quick_tour/sqla_demo/setup.py
parentb4c96d2892d8271b300b1920e3ce5d2c0eae588b (diff)
downloadpyramid-414b67b45bab156b9738105e180908c4eee8600a.tar.gz
pyramid-414b67b45bab156b9738105e180908c4eee8600a.tar.bz2
pyramid-414b67b45bab156b9738105e180908c4eee8600a.zip
Restore progress after backing changes out of master.
This reverts commit 049e670aef9ea5611561546fd5c0e2dd6152b9b7.
Diffstat (limited to 'docs/quick_tour/sqla_demo/setup.py')
-rw-r--r--docs/quick_tour/sqla_demo/setup.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/quick_tour/sqla_demo/setup.py b/docs/quick_tour/sqla_demo/setup.py
index ac2eed035..312a97c06 100644
--- a/docs/quick_tour/sqla_demo/setup.py
+++ b/docs/quick_tour/sqla_demo/setup.py
@@ -3,15 +3,18 @@ import os
from setuptools import setup, find_packages
here = os.path.abspath(os.path.dirname(__file__))
-README = open(os.path.join(here, 'README.txt')).read()
-CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
+with open(os.path.join(here, 'README.txt')) as f:
+ README = f.read()
+with open(os.path.join(here, 'CHANGES.txt')) as f:
+ CHANGES = f.read()
requires = [
'pyramid',
+ 'pyramid_jinja2',
+ 'pyramid_debugtoolbar',
+ 'pyramid_tm',
'SQLAlchemy',
'transaction',
- 'pyramid_tm',
- 'pyramid_debugtoolbar',
'zope.sqlalchemy',
'waitress',
]