Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove several references to python 2.6 #48

Merged
merged 1 commit into from
Jan 8, 2016
Merged

Remove several references to python 2.6 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_).
Expand Down
4 changes: 0 additions & 4 deletions {{cookiecutter.repo_name}}/ci/appveyor-bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"],
Expand Down
4 changes: 0 additions & 4 deletions {{cookiecutter.repo_name}}/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -151,9 +150,6 @@ skip_install = true
usedevelop = false
deps = coverage

[testenv:py26-nocov]
usedevelop = false

[testenv:py27-nocov]
usedevelop = false

Expand Down