From: Oleg Broytman <phd@phdru.name>
Date: Sun, 7 May 2017 17:21:47 +0000 (+0300)
Subject: Stop supporting Python 2.6
X-Git-Tag: 0.4.0~3
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=6fae43596df9f454186896d861c9062646e51ee1;p=ppu.git

Stop supporting Python 2.6

[skip ci]
---

diff --git a/devscripts/release b/devscripts/release
index 357cd2a..9837223 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 06c092b..5d2aba7 100644
--- a/devscripts/requirements/requirements.txt
+++ b/devscripts/requirements/requirements.txt
@@ -1,3 +1 @@
 --install-option=-O2
-
-argparse; python_version == '2.6'
diff --git a/docs/install.rst b/docs/install.rst
index 9015f0e..3631c26 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -15,8 +15,6 @@ User mode
 
     pip install --find-links=http://phdru.name/Software/Python/ --no-index --install-option='-O2' --user ppu
 
-For Python 2.6 the command is easy_install.
-
 Installation from sources
 =========================
 
diff --git a/setup.py b/setup.py
index e12e821..d25f5e0 100755
--- a/setup.py
+++ b/setup.py
@@ -4,15 +4,8 @@ import sys
 
 try:
     from setuptools import setup
-    is_setuptools = True
 except ImportError:
     from distutils.core import setup
-    is_setuptools = False
-
-kw = {}
-if is_setuptools:
-    if (sys.version_info[:2] == (2, 6)):
-        kw['install_requires'].append('argparse')
 
 setup(name='ppu',
       version='0.3.2',
@@ -32,7 +25,6 @@ setup(name='ppu',
           '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.3',
@@ -43,5 +35,4 @@ setup(name='ppu',
       scripts=[
           'scripts/cmp.py', 'scripts/remove-old-files.py', 'scripts/rm.py',
       ],
-      **kw
       )
diff --git a/tox.ini b/tox.ini
index 573a0ff..b3f3b85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,10 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27,py33,py34,py35,py36},{py27,py34}-flake8
+envlist = {py27,py33,py34,py35,py36},{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
 basepython =
-    py26: {env:TOXPYTHON:python2.6}
     py27: {env:TOXPYTHON:python2.7}
     py33: {env:TOXPYTHON:python3.3}
     py34: {env:TOXPYTHON:python3.4}
@@ -24,11 +23,6 @@ whitelist_externals =
 commands =
     {envpython} -m pytest
 
-[testenv:py26]
-commands =
-    {[testenv]commands}
-    {[general]commands}
-
 [testenv:py27]
 commands =
     {[testenv]commands}