1 new commit in pytest: https://bitbucket.org/hpk42/pytest/commits/548f02cb5efa/ Changeset: 548f02cb5efa User: hpk42 Date: 2014-09-05 09:50:40 Summary: strike python2.5 from test code cc @flub Affected #: 3 files
diff -r 766d82ca8b71cd455e4d174f595bb71232143626 -r 548f02cb5efaf71a280e2e21a3378e809652658a _pytest/genscript.py --- a/_pytest/genscript.py +++ b/_pytest/genscript.py @@ -72,11 +72,11 @@ deps = ['py', '_pytest', 'pytest'] if sys.version_info < (2,7): deps.append("argparse") - tw.line("generated script will run on python2.5-python3.3++") + tw.line("generated script will run on python2.6-python3.3++") else: tw.line("WARNING: generated script will not run on python2.6 " - "or below due to 'argparse' dependency. Use python2.6 " - "to generate a python2.5/6 compatible script", red=True) + "due to 'argparse' dependency. Use python2.6 " + "to generate a python2.6 compatible script", red=True) script = generate_script( 'import pytest; raise SystemExit(pytest.cmdline.main())', deps, diff -r 766d82ca8b71cd455e4d174f595bb71232143626 -r 548f02cb5efaf71a280e2e21a3378e809652658a doc/en/example/multipython.py --- a/doc/en/example/multipython.py +++ b/doc/en/example/multipython.py @@ -5,7 +5,7 @@ import py import pytest -pythonlist = ['python2.4', 'python2.5', 'python2.6', 'python2.7', 'python2.8'] +pythonlist = ['python2.6', 'python2.7', 'python3.4'] @pytest.fixture(params=pythonlist) def python1(request, tmpdir): picklefile = tmpdir.join("data.pickle") diff -r 766d82ca8b71cd455e4d174f595bb71232143626 -r 548f02cb5efaf71a280e2e21a3378e809652658a testing/conftest.py --- a/testing/conftest.py +++ b/testing/conftest.py @@ -77,12 +77,11 @@ winpymap = { 'python2.7': r'C:\Python27\python.exe', 'python2.6': r'C:\Python26\python.exe', - 'python2.5': r'C:\Python25\python.exe', - 'python2.4': r'C:\Python24\python.exe', 'python3.1': r'C:\Python31\python.exe', 'python3.2': r'C:\Python32\python.exe', 'python3.3': r'C:\Python33\python.exe', 'python3.4': r'C:\Python34\python.exe', + 'python3.5': r'C:\Python35\python.exe', } def getexecutable(name, cache={}): @@ -103,9 +102,8 @@ cache[name] = executable return executable -@pytest.fixture(params=['python2.5', 'python2.6', - 'python2.7', 'python3.2', "python3.3", - 'pypy', 'jython']) +@pytest.fixture(params=['python2.6', 'python2.7', 'python3.3', "python3.4", + 'pypy', 'pypy3', 'jython']) def anypython(request): name = request.param executable = getexecutable(name) Repository URL: https://bitbucket.org/hpk42/pytest/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ pytest-commit mailing list pytest-commit@python.org https://mail.python.org/mailman/listinfo/pytest-commit