diff options
| author | Tres Seaver <tseaver@palladion.com> | 2015-11-12 08:47:16 -0500 |
|---|---|---|
| committer | Tres Seaver <tseaver@palladion.com> | 2015-11-12 08:47:16 -0500 |
| commit | b4c96d2892d8271b300b1920e3ce5d2c0eae588b (patch) | |
| tree | 7c0bd810af0d239f0513653eb29eba6e1a08f6a2 /docs/quick_tour/sqla_demo/setup.py | |
| parent | e99cd355140258b7cd4cd9c1a83fd3ada1eb2b04 (diff) | |
| parent | 47162533af84bb8d26db6d1c9ba1e63d70e9070f (diff) | |
| download | pyramid-b4c96d2892d8271b300b1920e3ce5d2c0eae588b.tar.gz pyramid-b4c96d2892d8271b300b1920e3ce5d2c0eae588b.tar.bz2 pyramid-b4c96d2892d8271b300b1920e3ce5d2c0eae588b.zip | |
Merge branch 'master' into feature/alchemy-scaffold-update
Conflicts:
docs/tutorials/wiki2/basiclayout.rst
Diffstat (limited to 'docs/quick_tour/sqla_demo/setup.py')
| -rw-r--r-- | docs/quick_tour/sqla_demo/setup.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/docs/quick_tour/sqla_demo/setup.py b/docs/quick_tour/sqla_demo/setup.py index 312a97c06..ac2eed035 100644 --- a/docs/quick_tour/sqla_demo/setup.py +++ b/docs/quick_tour/sqla_demo/setup.py @@ -3,18 +3,15 @@ import os from setuptools import setup, find_packages here = os.path.abspath(os.path.dirname(__file__)) -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() +README = open(os.path.join(here, 'README.txt')).read() +CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() requires = [ 'pyramid', - 'pyramid_jinja2', - 'pyramid_debugtoolbar', - 'pyramid_tm', 'SQLAlchemy', 'transaction', + 'pyramid_tm', + 'pyramid_debugtoolbar', 'zope.sqlalchemy', 'waitress', ] |