From a862ae7e38203d37bdba9b53846dff084aade362 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sun, 7 May 2017 20:15:57 +0300 Subject: [PATCH] Stop supporting Python 2.6 --- devscripts/requirements/requirements.txt | 3 +-- docs/install.rst | 2 -- setup.py | 10 ---------- tox.ini | 5 +---- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/devscripts/requirements/requirements.txt b/devscripts/requirements/requirements.txt index bd5c09b..18707cb 100644 --- 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 d4a7334..96148bf 100644 --- 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 5f8f847..6cacd70 100755 --- 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 0cdfcd4..413b84a 100644 --- 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} -- 2.39.5