diff options
| author | Chris McDonough <chrism@plope.com> | 2014-05-05 23:48:51 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-05-05 23:48:51 -0400 |
| commit | 0caac0a0af78cd55df2e1f3c3c7fc5171dbfe849 (patch) | |
| tree | a624aa38b3db1f7de58bb8bf9aaff4583cec28fd /setup.py | |
| parent | ba85e591d563ed654f492f7cab5ca492a32a86d7 (diff) | |
| parent | 0117573edbc5dff565868187f8841859b3e36a51 (diff) | |
| download | pyramid-0caac0a0af78cd55df2e1f3c3c7fc5171dbfe849.tar.gz pyramid-0caac0a0af78cd55df2e1f3c3c7fc5171dbfe849.tar.bz2 pyramid-0caac0a0af78cd55df2e1f3c3c7fc5171dbfe849.zip | |
Merge branch 'master' into redundant_totuorial_logging_config
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.5b1', + version='1.6dev', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ @@ -79,6 +79,7 @@ setup(name='pyramid', "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Framework :: Pyramid", |