From: Oleg Broytman Date: Sun, 7 May 2017 17:11:55 +0000 (+0300) Subject: Stop supporting Python 2.6 X-Git-Url: https://git.phdru.name/?p=cookiecutter.git;a=commitdiff_plain;h=1be6d93333697c1969be9dbaa722299effa770f5 Stop supporting Python 2.6 --- diff --git a/project_template/devscripts/requirements/requirements.txt b/project_template/devscripts/requirements/requirements.txt index 0af882c..788a287 100644 --- a/project_template/devscripts/requirements/requirements.txt +++ b/project_template/devscripts/requirements/requirements.txt @@ -2,7 +2,6 @@ --find-links=http://phdru.name/Software/Python/ --install-option=-O2 -argparse; python_version == '2.6' m_lib.defenc >= 1.0 -m_lib >= 2.0; python_version >= '2.6' and python_version < '3.0' +m_lib >= 2.0; python_version >= '2.7' and python_version < '3.0' m_lib >= 3.0; python_version >= '3.3' diff --git a/project_template/docs/install.rst b/project_template/docs/install.rst index a7f6197..91b5c3e 100644 --- a/project_template/docs/install.rst +++ b/project_template/docs/install.rst @@ -15,8 +15,6 @@ User mode pip install --find-links=http://phdru.name/Software/Python/ --no-index --install-option='-O2' --user {project} -For Python 2.6 the command is easy_install. - Installation from sources ========================= diff --git a/project_template/setup.py b/project_template/setup.py index 21d21b6..f43df31 100755 --- a/project_template/setup.py +++ b/project_template/setup.py @@ -33,7 +33,6 @@ setup(name='{project}', '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', diff --git a/project_template/tox.ini b/project_template/tox.ini index c19b8ec..1b8aec7 100644 --- a/project_template/tox.ini +++ b/project_template/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 1.8 toxworkdir={homedir}/.tox/{project} -envlist = {py26,py27,py33,py34,py35,py36},{py27,py34}-flake8 +envlist = {py27,py33,py34,py35,py36},{py27,py34}-flake8 # Base test environment settings [testenv] @@ -26,11 +26,6 @@ whitelist_externals = commands = python -m pytest --cov={project} -[testenv:py26] -commands = - {[testenv]commands} - {[general]commands} - [testenv:py27] commands = {[testenv]commands}