Stop supporting Python 2.6

diff --git a/devscripts/requirements/requirements.txt b/devscripts/requirements/requirements.txt
index bd5c09b9e953e4b04f1f8838cc6cd32b076a003b..18707cb64cf8e22bccf17a4e958cc08f7e9e5f9e 100644 (file)
--- a/devscripts/requirements/requirements.txt
+++ b/devscripts/requirements/requirements.txt
@@ -1,6 +1,5 @@
 --install-option=-O2
 
-argparse; python_version == '2.6'
-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

diff --git a/docs/install.rst b/docs/install.rst
index d4a7334219785ee0854dfc5ea9ec8af06dab7fab..96148bfd124795acfd6ba7f04d915cbf30c5fe38 100644 (file)
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -22,8 +22,6 @@ Virtual envs
 
     pip install --trusted-host phdru.name --find-links=http://phdru.name/Software/Python/ --install-option='-O2' m_librarian
 
-For Python 2.6 the command is easy_install.
-
 Installation from sources
 =========================
 

diff --git a/setup.py b/setup.py
index 5f8f84701322dc5be53a82e9ece219f8e39c7c08..6cacd70920036f5a1edd8551eca43caa7da478eb 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,21 +1,12 @@
 #!/usr/bin/env python
 
-import sys
 from imp import load_source
 from os.path import abspath, dirname, join
 
 try:
     from setuptools import setup
-    is_setuptools = True
 except ImportError:
     from distutils.core import setup
-    is_setuptools = False
-
-kw = {}
-if is_setuptools:
-    kw['install_requires'] = ['SQLObject>=2.2.1', 'm_lib.defenc>=1.0']
-    if (sys.version_info[:2] == (2, 6)):
-        kw['install_requires'].append('argparse')
 
 versionpath = join(abspath(dirname(__file__)), 'm_librarian', '__version__.py')
 load_source('m_librarian_version', versionpath)
@@ -53,5 +44,4 @@ setup(name='m_librarian',
       },
       scripts=['scripts/ml-import.py', 'scripts/ml-initdb.py',
                'scripts/ml-search.py'],
-      **kw
       )

diff --git a/tox.ini b/tox.ini
index 0cdfcd47e6c9becb042d9e0071f7163dbbd045f6..413b84a903b0a5be695070059f33d8fde358bbd6 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.8
 toxworkdir={homedir}/.tox/m_librarian
-envlist = {py26,py27,py34},{py27,py34}-flake8
+envlist = {py27,py34},{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -16,9 +16,6 @@ whitelist_externals =
 commands =
     python -m pytest --cov=m_librarian
 
-[testenv:py26]
-commands = {[general]commands}
-
 [testenv:py27]
 commands = {[general]commands}