summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-10 15:27:00 +0000
committerGerrit Code Review <review@openstack.org>2015-04-10 15:27:00 +0000
commitfc755dc5512e71b5e6a9a36782fa319d02e7f5d3 (patch)
treec7992443a9469a7c2652d8d977a5cf24041a48af
parent67884ac481b53a8ee4532a1b972f462cdcd1af1d (diff)
parent6e5dae01adf2ab3eb7bb9b9afa08f8ba95d8eafc (diff)
downloaddjango_openstack_auth-fc755dc5512e71b5e6a9a36782fa319d02e7f5d3.tar.gz
Merge "Removing python 2.6 support"
-rw-r--r--setup.cfg1
-rw-r--r--tox.ini2
2 files changed, 1 insertions, 2 deletions
diff --git a/setup.cfg b/setup.cfg
index 2d3dfcf..ccc43c3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,6 @@ classifier =
Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
- Programming Language :: Python :: 2.6
Programming Language :: Python :: 3
Programming Language :: Python :: 3.3
Topic :: Internet :: WWW/HTTP
diff --git a/tox.ini b/tox.ini
index 3f597e3..3b78a4e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
[tox]
minversion = 1.6
skipsdist = True
-envlist = py26,py27,py27dj14,py27dj15,pep8,py33,py34
+envlist = py27,py27dj14,py27dj15,pep8,py33,py34
[testenv]
usedevelop = True