diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2015-10-20 23:19:18 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2015-10-20 23:19:18 -0600 |
| commit | 18e54fe9619fd8b2aa6006126fc1c2840e32f2c1 (patch) | |
| tree | ea26bbfd681ae5d821f2cde9ac5cbe2e80f5c714 /setup.py | |
| parent | bf40a3920278b3e7a01ef5403196b35f45cfcb3c (diff) | |
| parent | d4221720b8409eafb65b301562be327af0196c7e (diff) | |
| download | pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.tar.gz pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.tar.bz2 pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.zip | |
Merge branch 'master' of github.com:Pylons/pyramid into feature/configurable-view-deriver
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -56,10 +56,11 @@ if not PY3: tests_require.append('zope.component>=3.11.0') docs_extras = [ - 'Sphinx >= 1.2.3', + 'Sphinx >= 1.3.1', 'docutils', 'repoze.sphinx.autointerface', - 'pylons-sphinx-themes >= 0.3', + 'pylons_sphinx_latesturl', + 'pylons-sphinx-themes', ] testing_extras = tests_require + [ @@ -82,6 +83,7 @@ setup(name='pyramid', "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Framework :: Pyramid", @@ -109,6 +111,9 @@ 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 [console_scripts] pcreate = pyramid.scripts.pcreate:main pserve = pyramid.scripts.pserve:main |