Skip to content

Drop support for EOL Python 2.6 and 3.3 #181

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.

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

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
120 changes: 0 additions & 120 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,54 +10,6 @@ env:
- TOXENV=docs
matrix:
include:
- python: '2.6'
env:
- TOXENV=py26-29-40
- python: '2.6'
env:
- TOXENV=py26-29-41
- python: '2.6'
env:
- TOXENV=py26-29-42
- python: '2.6'
env:
- TOXENV=py26-29-43
- python: '2.6'
env:
- TOXENV=py26-30-40
- python: '2.6'
env:
- TOXENV=py26-30-41
- python: '2.6'
env:
- TOXENV=py26-30-42
- python: '2.6'
env:
- TOXENV=py26-30-43
- python: '2.6'
env:
- TOXENV=py26-31-40
- python: '2.6'
env:
- TOXENV=py26-31-41
- python: '2.6'
env:
- TOXENV=py26-31-42
- python: '2.6'
env:
- TOXENV=py26-31-43
- python: '2.6'
env:
- TOXENV=py26-32-40
- python: '2.6'
env:
- TOXENV=py26-32-41
- python: '2.6'
env:
- TOXENV=py26-32-42
- python: '2.6'
env:
- TOXENV=py26-32-43
- python: '2.7'
env:
- TOXENV=py27-29-40
Expand Down Expand Up @@ -106,54 +58,6 @@ matrix:
- python: '2.7'
env:
- TOXENV=py27-32-43
- python: '3.3'
env:
- TOXENV=py33-29-40
- python: '3.3'
env:
- TOXENV=py33-29-41
- python: '3.3'
env:
- TOXENV=py33-29-42
- python: '3.3'
env:
- TOXENV=py33-29-43
- python: '3.3'
env:
- TOXENV=py33-30-40
- python: '3.3'
env:
- TOXENV=py33-30-41
- python: '3.3'
env:
- TOXENV=py33-30-42
- python: '3.3'
env:
- TOXENV=py33-30-43
- python: '3.3'
env:
- TOXENV=py33-31-40
- python: '3.3'
env:
- TOXENV=py33-31-41
- python: '3.3'
env:
- TOXENV=py33-31-42
- python: '3.3'
env:
- TOXENV=py33-31-43
- python: '3.3'
env:
- TOXENV=py33-32-40
- python: '3.3'
env:
- TOXENV=py33-32-41
- python: '3.3'
env:
- TOXENV=py33-32-42
- python: '3.3'
env:
- TOXENV=py33-32-43
- python: '3.4'
env:
- TOXENV=py34-29-40
Expand Down Expand Up @@ -322,30 +226,6 @@ matrix:
- python: '2.7'
env:
- TOXENV=py27-32-44
- python: '3.3'
env:
- TOXENV=py33-29-43
- python: '3.3'
env:
- TOXENV=py33-29-44
- python: '3.3'
env:
- TOXENV=py33-30-43
- python: '3.3'
env:
- TOXENV=py33-30-44
- python: '3.3'
env:
- TOXENV=py33-31-43
- python: '3.3'
env:
- TOXENV=py33-31-44
- python: '3.3'
env:
- TOXENV=py33-32-43
- python: '3.3'
env:
- TOXENV=py33-32-44
- python: '3.4'
env:
- TOXENV=py34-29-43
Expand Down
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ cache:
environment:
matrix:
- TOXENV: check
- TOXENV: 'py26-29-40,py26-29-41,py26-29-42,py26-29-43,py26-30-40,py26-30-41,py26-30-42,py26-30-43,py26-31-40,py26-31-41,py26-31-42,py26-31-43,py26-32-40,py26-32-41,py26-32-42,py26-32-43'
- TOXENV: 'py27-29-40,py27-29-41,py27-29-42,py27-29-43,py27-30-40,py27-30-41,py27-30-42,py27-30-43,py27-31-40,py27-31-41,py27-31-42,py27-31-43,py27-32-40,py27-32-41,py27-32-42,py27-32-43,py27-29-43,py27-29-44,py27-30-43,py27-30-44,py27-31-43,py27-31-44,py27-32-43,py27-32-44'
- TOXENV: 'py34-29-40,py34-29-41,py34-29-42,py34-29-43,py34-30-40,py34-30-41,py34-30-42,py34-30-43,py34-31-40,py34-31-41,py34-31-42,py34-31-43,py34-32-40,py34-32-41,py34-32-42,py34-32-43,py34-29-43,py34-29-44,py34-30-43,py34-30-44,py34-31-43,py34-31-44,py34-32-43,py34-32-44'
- TOXENV: 'py35-29-40,py35-29-41,py35-29-42,py35-29-43,py35-30-40,py35-30-41,py35-30-42,py35-30-43,py35-31-40,py35-31-41,py35-31-42,py35-31-43,py35-32-40,py35-32-41,py35-32-42,py35-32-43,py35-29-43,py35-29-44,py35-30-43,py35-30-44,py35-31-43,py35-31-44,py35-32-43,py35-32-44'
Expand Down
6 changes: 3 additions & 3 deletions ci/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@

if __name__ == "__main__":
base_path = dirname(dirname(abspath(__file__)))
print("Project path: {0}".format(base_path))
print("Project path: {}".format(base_path))
env_path = join(base_path, ".tox", "bootstrap")
if sys.platform == "win32":
bin_path = join(env_path, "Scripts")
else:
bin_path = join(env_path, "bin")
if not exists(env_path):
import subprocess
print("Making bootstrap env in: {0} ...".format(env_path))
print("Making bootstrap env in: {} ...".format(env_path))
try:
subprocess.check_call(["virtualenv", env_path])
except Exception:
Expand All @@ -46,7 +46,7 @@
tox_environments = [line for line in tox_environments if line not in ['clean', 'report', 'docs', 'check']]

template_vars = {'tox_environments': tox_environments}
for py_ver in '26 27 33 34 35 py'.split():
for py_ver in '27 34 35 py'.split():
template_vars['py%s_environments' % py_ver] = [x for x in tox_environments if x.startswith('py' + py_ver)]

for name in os.listdir(join("ci", "templates")):
Expand Down
1 change: 0 additions & 1 deletion ci/templates/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ cache:
environment:
matrix:
- TOXENV: check
- TOXENV: '{{ py26_environments|join(",") }}'
- TOXENV: '{{ py27_environments|join(",") }}'
- TOXENV: '{{ py34_environments|join(",") }}'
- TOXENV: '{{ py35_environments|join(",") }}'
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
project = 'pytest-cov'
year = '2016'
author = 'pytest-cov contributors'
copyright = '{0}, {1}'.format(year, author)
copyright = '{}, {}'.format(year, author)
version = release = '2.5.1'

pygments_style = 'trac'
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,9 @@ def run(self):
'Operating System :: POSIX',
'Operating System :: Unix',
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
Expand Down
8 changes: 1 addition & 7 deletions tests/test_pytest_cov.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,7 @@ def test_term_output_dir(testdir):
'--cov-report=term:' + DEST_DIR,
script)

# backport of argparse to py26 doesn't display ArgumentTypeError message
result.stderr.fnmatch_lines([
'*argument --cov-report: *',
] if tuple(sys.version_info[:2]) == (2, 6) else [
'*argument --cov-report: output specifier not supported for: "term:%s"*' % DEST_DIR,
])
assert result.ret != 0
Expand All @@ -288,10 +285,7 @@ def test_term_missing_output_dir(testdir):
'--cov-report=term-missing:' + DEST_DIR,
script)

# backport of argparse to py26 doesn't display ArgumentTypeError message
result.stderr.fnmatch_lines([
'*argument --cov-report: *',
] if tuple(sys.version_info[:2]) == (2, 6) else [
'*argument --cov-report: output specifier not supported for: '
'"term-missing:%s"*' % DEST_DIR,
])
Expand Down Expand Up @@ -719,7 +713,7 @@ def test_dist_missing_data(testdir):
exe = os.path.join(venv_path, 'bin', 'python')
subprocess.check_call([
exe,
'-mpip' if sys.version_info >= (2, 7) else '-mpip.__main__',
'-mpip',
'install',
'py==%s' % py.__version__,
'pytest==%s' % pytest.__version__
Expand Down
6 changes: 2 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
[tox]
envlist =
check,
{py26,py27,py33,py34,py35,pypy}-{29,30,31,32}-{40,41,42,43},
{py27,py33,py34,py35,py36,pypy}-{29,30,31,32}-{43,44},
{py27,py34,py35,pypy}-{29,30,31,32}-{40,41,42,43},
{py27,py34,py35,py36,pypy}-{29,30,31,32}-{43,44},
docs

[testenv]
basepython =
pypy: pypy
py26: {env:TOXPYTHON:python2.6}
{py27,docs}: {env:TOXPYTHON:python2.7}
py33: {env:TOXPYTHON:python3.3}
py34: {env:TOXPYTHON:python3.4}
py35: {env:TOXPYTHON:python3.5}
py36: {env:TOXPYTHON:python3.6}
Expand Down