From 55e49af2915c46b10d9561f851f08f0c71736bbe Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Fri, 23 Jan 2015 12:29:37 +0100
Subject: [PATCH] Remove Python 2.6 support
OpenStack dropped Python 2.6 support, so let's remove it from setup.cfg
and drop the argparse requirement as it is native in Python >2.7.
Change-Id: I76be413c00bfc64f6f125d7264ee8b4fbe31a5a5
---
doc/source/contributing.rst | 2 +-
doc/source/install.rst | 7 +------
requirements.txt | 1 -
setup.cfg | 1 -
tox.ini | 2 +-
5 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
index ce64c1ba..192b01c2 100644
--- a/doc/source/contributing.rst
+++ b/doc/source/contributing.rst
@@ -152,6 +152,6 @@ You can run tests using Tox:
$ tox
-This will run tests under Python 2.6, 2.7 and verify `PEP 8
+This will run tests under Python 2.7 and verify `PEP 8
<http://www.python.org/dev/peps/pep-0008/>`_ compliance. The identical test
suite is run by OpenStack's Jenkins whenever you send a patch.
diff --git a/doc/source/install.rst b/doc/source/install.rst
index aabbab18..4cbf3d7c 100644
--- a/doc/source/install.rst
+++ b/doc/source/install.rst
@@ -60,18 +60,13 @@ Now create your virtualenv.
$ sudo pip install --upgrade setuptools
To run the test suite use the following command. This will run
-against Python 2.6, Python 2.7 and run the `flake8
+against Python 2.7 and run the `flake8
<https://flake8.readthedocs.org>`_ code linting.
.. code-block:: bash
$ tox
-.. note::
-
- If you only have access to Python 2.6 or 2.7 locally pass
- in `-e py26` or `-e py27` respectively.
-
Configuration
-------------
diff --git a/requirements.txt b/requirements.txt
index 71d1a578..89e5866c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,6 @@
pbr>=0.6,!=0.7,<1.0
anyjson>=0.3.3
-argparse
Babel>=1.3
# The egg=tripleo-heat-templates suffix is needed by pbr's requirements
# processing code
diff --git a/setup.cfg b/setup.cfg
index 0272ca3f..ff660755 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
[files]
packages =
diff --git a/tox.ini b/tox.ini
index 8f488d1b..09a4eb67 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
[tox]
minversion = 1.6
skipsdist = True
-envlist = py26,py27,pep8
+envlist = py27,pep8
[testenv]
usedevelop = True