From b7f40060ba79b62f315cc2c452be2f33dcaead38 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Tue, 25 Nov 2014 16:57:35 +0100
Subject: [PATCH] Remove Python 2.6 classifier

Horizon does not support Python 2.6 anymore starting with Kilo and might
not work correctly with it, so remove the classifier.

Change-Id: Idb2a044968bf35c1fbe4ab42188c6f7df096d442
---
 doc/source/topics/install.rst | 2 +-
 setup.cfg                     | 1 -
 tox.ini                       | 6 +-----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/doc/source/topics/install.rst b/doc/source/topics/install.rst
index 13466f259b..0d6f967729 100644
--- a/doc/source/topics/install.rst
+++ b/doc/source/topics/install.rst
@@ -9,7 +9,7 @@ This page covers the basic installation of Horizon.
 System Requirements
 ===================
 
-* Python 2.7 (or 2.6)
+* Python 2.7
 * Django 1.6 (1.4 and 1.5 are supported too)
 * Minimum required set of running OpenStack services are:
 
diff --git a/setup.cfg b/setup.cfg
index 02b4cdf5bf..b6a647266e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,7 +20,6 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 2.6
     Topic :: Internet :: WWW/HTTP
 
 [global]
diff --git a/tox.ini b/tox.ini
index a01fd3fead..de9119b270 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py27dj14,py27dj15,pep8,py33,py34
+envlist = py27,py27dj14,py27dj15,pep8,py33,py34
 minversion = 1.6
 skipsdist = True
 
@@ -44,10 +44,6 @@ commands = pip install django>=1.5,<1.6
 basepython = python2.7
 commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}
 
-[testenv:py26integration]
-basepython = python2.6
-commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}
-
 [testenv:jshint]
 commands = nodeenv -p
            npm install jshint -g