summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-08-13 13:50:06 -0400
committerPaul Everitt <paul@agendaless.com>2013-08-13 13:50:06 -0400
commit0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6 (patch)
tree6d9f12bc42fde9fea95d7754f2decff212acf6ee /setup.py
parentd44d0e044555cd1287680fc8368632a64ebe979b (diff)
parent5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff)
downloadpyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.gz
pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.bz2
pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 4a3cecd98..0cff30439 100644
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@ testing_extras = tests_require + [
]
setup(name='pyramid',
- version='1.4',
+ version='1.5dev',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,
@@ -118,6 +118,7 @@ setup(name='pyramid',
pviews = pyramid.scripts.pviews:main
ptweens = pyramid.scripts.ptweens:main
prequest = pyramid.scripts.prequest:main
+ pdistreport = pyramid.scripts.pdistreport:main
[paste.server_runner]
wsgiref = pyramid.scripts.pserve:wsgiref_server_runner
cherrypy = pyramid.scripts.pserve:cherrypy_server_runner