Merge branch 'maint-0.4'

Conflicts: doc/changelog.rst
wearpants · Mar 9, 2015 · 88f1da5 · 88f1da5
2 parents a03080f + ef1eaf0
commit 88f1da5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.6
+0.4.7
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -13,6 +13,11 @@ Changelog
 - PEP8 name compliance
 - add logging_compat module for compatibility with stlib's logging
 
+0.4.7
+******************************
+*03/09/2015*
+- add missing classifiers to setup.py
+
 ******************************
 0.4.6
 ******************************

diff --git a/setup.py b/setup.py
@@ -25,6 +25,13 @@
       "Topic :: System :: Logging",
       "Development Status :: 5 - Production/Stable",
       "Intended Audience :: Developers",
+      "Programming Language :: Python",
+      "Programming Language :: Python :: 2",
+      "Programming Language :: Python :: 2.6",
+      "Programming Language :: Python :: 2.7",
+      "Programming Language :: Python :: 3",
+      "Programming Language :: Python :: 3.3",
+      "Programming Language :: Python :: 3.4",
       "License :: OSI Approved :: BSD License",],
       long_description=open('README.rst').read(),
       )