From: Oleg Broytman <phd@phdru.name>
Date: Sun, 7 May 2017 17:25:11 +0000 (+0300)
Subject: Stop supporting Python 2.6
X-Git-Tag: 0.2.2~9
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=7d6c89bbfba4554ffe68dd8da0e6fed5961aa128;p=sqlconvert.git

Stop supporting Python 2.6

[skip ci]
---

diff --git a/devscripts/release b/devscripts/release
index 32bcca1..f1079da 100755
--- a/devscripts/release
+++ b/devscripts/release
@@ -9,7 +9,7 @@ python setup.py build_py &&
 python setup.py build --executable '/usr/bin/env python' &&
 python setup.py sdist &&
 
-for py in 2.6 2.7 3.4 3.5 3.6; do
+for py in 2.7 3.4 3.5 3.6; do
    find build -name '*.py[co]' -delete &&
    python$py setup.py build_py &&
    python$py setup.py build --executable '/usr/bin/env python' &&
diff --git a/devscripts/requirements/requirements.txt b/devscripts/requirements/requirements.txt
index e558e85..d1a7b7b 100644
--- a/devscripts/requirements/requirements.txt
+++ b/devscripts/requirements/requirements.txt
@@ -1,8 +1,7 @@
 --install-option=-O2
 
-argparse; python_version == '2.6'
 sqlparse
-SQLObject>=2.2.1; python_version >= '2.6' and python_version < '3.0'
+SQLObject>=2.2.1; python_version >= '2.7' and python_version < '3.0'
 SQLObject>=3.0.0; python_version >= '3.4'
 m_lib.defenc>=1.0
 m_lib>=3.1
diff --git a/docs/install.rst b/docs/install.rst
index 4ca147d..5405039 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -23,8 +23,6 @@ Virtual envs
 
     pip install --trusted-host phdru.name --find-links=http://phdru.name/Software/Python/ --install-option='-O2' sqlconvert
 
-For Python 2.6 the command is easy_install.
-
 Installation from sources
 =========================
 
diff --git a/setup.py b/setup.py
index a73d596..241185a 100755
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,6 @@ setup(name='sqlconvert',
           'License :: OSI Approved :: GNU General Public License (GPL)',
           'Operating System :: OS Independent',
           'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.6',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.4',
diff --git a/tox.ini b/tox.ini
index 0e276dc..6feee24 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27,py34,py35,py36},{py26,py27,py34,py35,py36}-{postgres,sqlite},{py27,py34}-flake8
+envlist = {py27,py34,py35,py36},{py27,py34,py35,py36}-{postgres,sqlite},{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -30,9 +30,6 @@ commands =
     {envpython} {envbindir}/cmp.py -i tests/mysql2sql/test.out test.out
     {envpython} {envbindir}/rm.py test.out
 
-[testenv:py26]
-commands = {[general]commands}
-
 [testenv:py27]
 commands = {[general]commands}
 
@@ -54,9 +51,6 @@ commands =
     {envpython} -m pytest --cov=sqlconvert -D postgres:///test
     dropdb test
 
-[testenv:py26-postgres]
-commands = {[postgresql]commands}
-
 [testenv:py27-postgres]
 commands = {[postgresql]commands}
 
@@ -77,9 +71,6 @@ commands =
     {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
     {envpython} {envbindir}/rm.py /tmp/test.sqdb
 
-[testenv:py26-sqlite]
-commands = {[sqlite]commands}
-
 [testenv:py27-sqlite]
 commands = {[sqlite]commands}