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