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 /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 'setup.py')
| -rw-r--r-- | setup.py | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -111,9 +111,8 @@ setup(name='pyramid', starter=pyramid.scaffolds:StarterProjectTemplate zodb=pyramid.scaffolds:ZODBProjectTemplate alchemy=pyramid.scaffolds:AlchemyProjectTemplate - [pyramid.pshell] - ipython=pyramid.scripts.pshell:PShellCommand.make_ipython_shell - bpython=pyramid.scripts.pshell:PShellCommand.make_bpython_shell + [pyramid.pshell_runner] + python=pyramid.scripts.pshell:python_shell_runner [console_scripts] pcreate = pyramid.scripts.pcreate:main pserve = pyramid.scripts.pserve:main |