summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-10-21 00:34:10 -0500
committerMichael Merickel <michael@merickel.org>2015-10-21 00:34:10 -0500
commit504027873ab0e1b15601e2d1900ef8a4469f6a43 (patch)
tree06e6cbf634a894dbce232c9dbb06324637a95a86 /setup.py
parentbf40a3920278b3e7a01ef5403196b35f45cfcb3c (diff)
parente1ec631ab2d470b1550640d21c28ddd1387f4045 (diff)
downloadpyramid-504027873ab0e1b15601e2d1900ef8a4469f6a43.tar.gz
pyramid-504027873ab0e1b15601e2d1900ef8a4469f6a43.tar.bz2
pyramid-504027873ab0e1b15601e2d1900ef8a4469f6a43.zip
Merge pull request #2020 from bertjwregeer/feature/configurable-view-deriver
Configurable View Deriver moving forward...
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index ac03da9f5..2a4271138 100644
--- a/setup.py
+++ b/setup.py
@@ -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