Merge "Remove Python 2.6 classifier"

2014-12-10 20:29:43 +00:00 · 2014-12-10 20:29:43 +00:00 · 6a3137de22
commit 6a3137de22
parent 6ca66128f1 e0f773ee5e
3 changed files with 1 additions and 3 deletions
--- a/heat/tests/testing-overview.txt
+++ b/heat/tests/testing-overview.txt
@ -45,5 +45,4 @@ To run the tests with a clean virtual env in the same manner as the
 OpenStack testing infrastructure does so, use tox.

 $ tox -epy27 # test suite on python 2.7
-$ tox -epy26 # test suite on python 2.6
 $ tox -epep8 # run full source code checker
--- a/setup.cfg
+++ b/setup.cfg
@ -16,7 +16,6 @@ classifier =
    Programming Language :: Python
    Programming Language :: Python :: 2
    Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 2.6

 [files]
 packages =
--- a/tox.ini
+++ b/tox.ini
@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pep8
+envlist = py27,pep8
 minversion = 1.6
 skipsdist = True