summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFUJITA Tomonori <tomof@acm.org>2016-02-10 14:29:46 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2016-02-18 06:54:47 +0900
commitaf5e6b5fb7bfcce070fb94c46157546a70453c34 (patch)
treebd01e263d110b468d5d1ddfdbc018cd0ed8a8d79
parent27409a544e45bc7a51080e83860e88cc40ce760c (diff)
drop python2.6 support
The Python core team[*1] stopped supporting python 2.6. Some Python libraries started following the same path and trying to support 2.6 becomes painful... For example, most of you already noticed, oslo.config dropped 2.6 support. I tried to work around it with the following commit: https://github.com/osrg/ryu/commit/22501710983fb79a8a337e6bf650821efdc7cf59 But this forces users of decent distributions (e.g Ubuntu 14.04) to upgrade pip (old pip versions can't understand version conditions). [*1] http://www.curiousefficiency.org/posts/2015/04/stop-supporting-python26.html Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--.travis.yml1
-rw-r--r--setup.cfg1
-rw-r--r--tools/pip-requires3
-rw-r--r--tox.ini2
4 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index f55c0ed2..99857d09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ python:
- "2.7"
env:
- - TOX_ENV=py26
- TOX_ENV=py27
- TOX_ENV=py34
- TOX_ENV=pypy
diff --git a/setup.cfg b/setup.cfg
index 626e0f89..22737a31 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,7 +13,6 @@ classifier =
Topic :: System :: Networking
Natural Language :: English
Programming Language :: Python
- Programming Language :: Python :: 2.6
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.4
diff --git a/tools/pip-requires b/tools/pip-requires
index c274774d..567600f1 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -1,8 +1,7 @@
eventlet>=0.15
msgpack-python>=0.3.0 # RPC library, BGP speaker(net_cntl)
netaddr
-oslo.config>=1.6.0, <=3.0.0 ; python_version < '2.7'
-oslo.config>=1.6.0 ; python_version >= '2.7'
+oslo.config>=1.6.0
routes # wsgi
six>=1.4.0
webob>=1.2 # wsgi
diff --git a/tox.ini b/tox.ini
index d13f4445..b0cbdd13 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,py34,pypy,pep8
+envlist = py27,py34,pypy,pep8
[testenv]
deps = -U