summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-25 22:41:25 +0000
committerGerrit Code Review <review@openstack.org>2016-01-25 22:41:25 +0000
commit3c787e753f55aa512a1aa73bbbcf82a59edd0172 (patch)
tree4d8ecc92dfb7b58a1a3647665fe93484fdb8d707
parentd5816ab7f0372b62dd7ee0151afe46eba42ccb37 (diff)
parent5abd30494e10024857094a28a888e7d290c14692 (diff)
Merge "Remove support for py33/py26"
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini2
2 files changed, 1 insertions, 3 deletions
diff --git a/setup.cfg b/setup.cfg
index 9f98cc1..1c5991f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,8 +19,6 @@ classifier =
19 Programming Language :: Python :: 2.6 19 Programming Language :: Python :: 2.6
20 Programming Language :: Python :: 2.7 20 Programming Language :: Python :: 2.7
21 Programming Language :: Python :: 3 21 Programming Language :: Python :: 3
22 Programming Language :: Python :: 3.2
23 Programming Language :: Python :: 3.3
24 Programming Language :: Python :: 3.4 22 Programming Language :: Python :: 3.4
25 23
26[entry_points] 24[entry_points]
diff --git a/tox.ini b/tox.ini
index f90ce39..43d0e1c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
1[tox] 1[tox]
2minversion = 1.6 2minversion = 1.6
3skipsdist = True 3skipsdist = True
4envlist = py34,py26,py27,pep8 4envlist = py34,py27,pep8
5 5
6[testenv] 6[testenv]
7setenv = VIRTUAL_ENV={envdir} 7setenv = VIRTUAL_ENV={envdir}