diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-22 14:13:09 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-22 14:13:09 -0400 |
| commit | 00c590bd7425565221f44b5f0e6eafe3e1fbd4b8 (patch) | |
| tree | 3c5b3af930babdaecad22e5bd006ee4d4f77cfe2 /setup.py | |
| parent | c61f4665dff59c3ed1ab342a7805e5d4524877b3 (diff) | |
| parent | 78b41e570f69f054a51cd3f32432b92b261ed268 (diff) | |
| download | pyramid-00c590bd7425565221f44b5f0e6eafe3e1fbd4b8.tar.gz pyramid-00c590bd7425565221f44b5f0e6eafe3e1fbd4b8.tar.bz2 pyramid-00c590bd7425565221f44b5f0e6eafe3e1fbd4b8.zip | |
Merge branch 'master' into 1.5-branch
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -69,9 +69,8 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.5a1', - description=('The Pyramid Web Framework, a ' - 'Pylons project'), + version='1.5a2', + description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ "Intended Audience :: Developers", |