summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-10 20:29:16 +0000
committerGerrit Code Review <review@openstack.org>2015-12-10 20:29:16 +0000
commit4d9b1e760d48aba570ccf07281ddaad110ed9a6a (patch)
treeac3991c47278d21cff3edc091a3785f46eb8162d
parent423ede01c4a8f84a20def1ff0d791c0974590933 (diff)
parentcffdc9d3579d764500f613b74eaaba14520313bd (diff)
downloadpython-swiftclient-4d9b1e760d48aba570ccf07281ddaad110ed9a6a.tar.gz
Merge "Remove py26 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 290c1ba..d745957 100644
--- 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
Programming Language :: Python :: 3
Programming Language :: Python :: 3.3
Programming Language :: Python :: 3.4
diff --git a/tox.ini b/tox.ini
index a467015..e904924 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,py33,py34,py35,pypy,pep8
+envlist = py27,py33,py34,py35,pypy,pep8
minversion = 1.6
skipsdist = True