summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-15 05:20:15 +0000
committerGerrit Code Review <review@openstack.org>2017-02-15 05:20:15 +0000
commit82b464bcd4e9f6b90bffb67a64b37970642592d5 (patch)
tree899df91723920732fa860933ec017a636088a529
parentcc40e473352b34f19ce8a169715f3e8a3108ad52 (diff)
parenta26b2adc55234221d53020b41e20debbd1d98654 (diff)
Merge "Remove support for py34"
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini6
2 files changed, 4 insertions, 4 deletions
diff --git a/setup.cfg b/setup.cfg
index 89587be..3412711 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,7 +15,7 @@ classifier =
15 Programming Language :: Python 15 Programming Language :: Python
16 Programming Language :: Python :: 2 16 Programming Language :: Python :: 2
17 Programming Language :: Python :: 2.7 17 Programming Language :: Python :: 2.7
18 Programming Language :: Python :: 3.4 18 Programming Language :: Python :: 3
19 Programming Language :: Python :: 3.5 19 Programming Language :: Python :: 3.5
20 20
21[files] 21[files]
diff --git a/tox.ini b/tox.ini
index 83af255..226b1be 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
1[tox] 1[tox]
2minversion = 1.6 2minversion = 1.6
3envlist = py35,py34,py27,pep8 3envlist = py35,py27,pep8
4skipsdist = True 4skipsdist = True
5 5
6[testenv] 6[testenv]
@@ -27,8 +27,8 @@ commands = oslo_debug_helper {posargs}
27basepython = python2.7 27basepython = python2.7
28commands = oslo_debug_helper {posargs} 28commands = oslo_debug_helper {posargs}
29 29
30[testenv:debug-py34] 30[testenv:debug-py35]
31basepython = python3.4 31basepython = python3.5
32commands = oslo_debug_helper {posargs} 32commands = oslo_debug_helper {posargs}
33 33
34[testenv:functional-api] 34[testenv:functional-api]