From 3731267c508430963c8727950608b57c3922314d Mon Sep 17 00:00:00 2001 From: Lucas Wiman Date: Wed, 6 Jan 2016 22:35:52 -0800 Subject: [PATCH] Remove several references to python 2.6, which is no longer included in the test matrix --- README.rst | 4 ++-- {{cookiecutter.repo_name}}/ci/appveyor-bootstrap.py | 4 ---- {{cookiecutter.repo_name}}/tox.ini | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/README.rst b/README.rst index 99007371..7966bc37 100644 --- a/README.rst +++ b/README.rst @@ -28,8 +28,8 @@ Features This is an "all inclusive" sort of template. * BSD 2-clause license. -* Tox_ for managing test environments for Python 2.6, 2.7, 3.3, PyPy etc. -* Pytest_ or Nose_ for testing Python 2.6, 2.7, 3.3, PyPy etc. +* Tox_ for managing test environments for Python 2.7, 3.3, PyPy etc. +* Pytest_ or Nose_ for testing Python 2.7, 3.3, PyPy etc. * *Optional* support for creating a tests matrix out of dependencies and python versions. * Travis-CI_ and AppVeyor_ for continuous testing. * Coveralls_ or Codecov_ for coverage tracking (using Tox_). diff --git a/{{cookiecutter.repo_name}}/ci/appveyor-bootstrap.py b/{{cookiecutter.repo_name}}/ci/appveyor-bootstrap.py index bc351bc0..74abd0bc 100644 --- a/{{cookiecutter.repo_name}}/ci/appveyor-bootstrap.py +++ b/{{cookiecutter.repo_name}}/ci/appveyor-bootstrap.py @@ -18,8 +18,6 @@ GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py" GET_PIP_PATH = "C:\get-pip.py" URLS = { - ("2.6", "64"): BASE_URL + "2.6.6/python-2.6.6.amd64.msi", - ("2.6", "32"): BASE_URL + "2.6.6/python-2.6.6.msi", ("2.7", "64"): BASE_URL + "2.7.10/python-2.7.10.amd64.msi", ("2.7", "32"): BASE_URL + "2.7.10/python-2.7.10.msi", # NOTE: no .msi installer for 3.3.6 @@ -32,8 +30,6 @@ } INSTALL_CMD = { # Commands are allowed to fail only if they are not the last command. Eg: uninstall (/x) allowed to fail. - "2.6": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"], - ["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]], "2.7": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"], ["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]], "3.3": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"], diff --git a/{{cookiecutter.repo_name}}/tox.ini b/{{cookiecutter.repo_name}}/tox.ini index 4c54a072..dc81a5e8 100644 --- a/{{cookiecutter.repo_name}}/tox.ini +++ b/{{cookiecutter.repo_name}}/tox.ini @@ -29,7 +29,6 @@ envlist = [testenv] basepython = pypy: {env:TOXPYTHON:pypy} - py26: {env:TOXPYTHON:python2.6} {py27,docs,spell}: {env:TOXPYTHON:python2.7} py33: {env:TOXPYTHON:python3.3} py34: {env:TOXPYTHON:python3.4} @@ -151,9 +150,6 @@ skip_install = true usedevelop = false deps = coverage -[testenv:py26-nocov] -usedevelop = false - [testenv:py27-nocov] usedevelop = false