diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:03:24 -0700 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:03:24 -0700 |
| commit | 30ae71b4a7ad97a649165374a75a70f4b64ae25c (patch) | |
| tree | b8a2cd06ff0130fd31b702862db2e46d39cd4e71 /setup.py | |
| parent | 504027873ab0e1b15601e2d1900ef8a4469f6a43 (diff) | |
| parent | 5558386fd1a6181b2e8ad06659049c055a7ed023 (diff) | |
| download | pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.gz pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.bz2 pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.zip | |
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -61,6 +61,7 @@ docs_extras = [ 'repoze.sphinx.autointerface', 'pylons_sphinx_latesturl', 'pylons-sphinx-themes', + 'sphinxcontrib-programoutput', ] testing_extras = tests_require + [ @@ -111,9 +112,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 |