From e877e255873777d6cff6040a638dd1d749bc1add Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com>
Date: Mon, 27 Jun 2016 14:26:12 +0200
Subject: [PATCH 1/4] drop python 3.0-3.2 support code from setup.py
addresses #1627
---
CHANGELOG.rst | 2 ++
setup.py | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b9315c9ca4f..74a3dff7af1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -27,10 +27,12 @@
Thanks to `@RedBeardCode`_ for the PR(`#1664`_)
+* removed support code for python 3 < 3.3 addresssing (`#1627`_)
.. _#607: https://github.com/pytest-dev/pytest/issues/607
.. _#1519: https://github.com/pytest-dev/pytest/pull/1519
.. _#1664: https://github.com/pytest-dev/pytest/pull/1664
+.. _#1627: https://github.com/pytest-dev/pytest/pull/1627
2.10.0.dev1
diff --git a/setup.py b/setup.py
index bcc1f176631..23ac0eb03fd 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@
'Topic :: Software Development :: Libraries',
'Topic :: Utilities'] + [
('Programming Language :: Python :: %s' % x) for x in
- '2 2.6 2.7 3 3.2 3.3 3.4 3.5'.split()]
+ '2 2.6 2.7 3 3.3 3.4 3.5'.split()]
with open('README.rst') as fd:
long_description = fd.read()
@@ -51,10 +51,10 @@ def main():
install_requires = ['py>=1.4.29'] # pluggy is vendored in _pytest.vendored_packages
extras_require = {}
if has_environment_marker_support():
- extras_require[':python_version=="2.6" or python_version=="3.0" or python_version=="3.1"'] = ['argparse']
+ extras_require[':python_version=="2.6"'] = ['argparse']
extras_require[':sys_platform=="win32"'] = ['colorama']
else:
- if sys.version_info < (2, 7) or (3,) <= sys.version_info < (3, 2):
+ if sys.version_info < (2, 7):
install_requires.append('argparse')
if sys.platform == 'win32':
install_requires.append('colorama')
From 7dc8d1ab60a8ab0616070a582225b8930f32bc51 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com>
Date: Mon, 27 Jun 2016 18:19:00 +0200
Subject: [PATCH 2/4] fix typo and remove python3.2 from readme
---
CHANGELOG.rst | 2 +-
README.rst | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 74a3dff7af1..e67cffc70bc 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -27,7 +27,7 @@
Thanks to `@RedBeardCode`_ for the PR(`#1664`_)
-* removed support code for python 3 < 3.3 addresssing (`#1627`_)
+* removed support code for python 3 < 3.3 addressing (`#1627`_)
.. _#607: https://github.com/pytest-dev/pytest/issues/607
.. _#1519: https://github.com/pytest-dev/pytest/pull/1519
diff --git a/README.rst b/README.rst
index 3c658ee93fc..a9d0ea3e6db 100644
--- a/README.rst
+++ b/README.rst
@@ -17,7 +17,7 @@
:target: https://ci.appveyor.com/project/pytestbot/pytest
The ``pytest`` framework makes it easy to write small tests, yet
-scales to support complex functional testing for applications and libraries.
+scales to support complex functional testing for applications and libraries.
An example of a simple test:
@@ -35,7 +35,7 @@ To execute it::
$ pytest
======= test session starts ========
- platform linux -- Python 3.4.3, pytest-2.8.5, py-1.4.31, pluggy-0.3.1
+ platform linux -- Python 3.4.3, pytest-2.8.5, py-1.4.31, pluggy-0.3.1
collected 1 items
test_sample.py F
@@ -52,7 +52,7 @@ To execute it::
======= 1 failed in 0.12 seconds ========
Due to ``pytest``'s detailed assertion introspection, only plain ``assert`` statements are used. See `getting-started <http://pytest.org/latest/getting-started.html#our-first-test-run>`_ for more examples.
-
+
Features
--------
@@ -69,7 +69,7 @@ Features
- Can run `unittest <http://pytest.org/latest/unittest.html>`_ (or trial),
`nose <http://pytest.org/latest/nose.html>`_ test suites out of the box;
-- Python2.6+, Python3.2+, PyPy-2.3, Jython-2.5 (untested);
+- Python2.6+, Python3.3+, PyPy-2.3, Jython-2.5 (untested);
- Rich plugin architecture, with over 150+ `external plugins <http://pytest.org/latest/plugins.html#installing-external-plugins-searching>`_ and thriving community;
From 2a43237527eeb304f50d5c81fcb81b1f66a357fa Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com>
Date: Mon, 27 Jun 2016 18:20:56 +0200
Subject: [PATCH 3/4] docs: no longer include python 3.0-3.2 in the index page
---
doc/en/index.rst | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/doc/en/index.rst b/doc/en/index.rst
index 04b4512da30..feb0d4bcc88 100644
--- a/doc/en/index.rst
+++ b/doc/en/index.rst
@@ -6,7 +6,7 @@ pytest: helps you write better programs
**a mature full-featured Python testing tool**
- - runs on Posix/Windows, Python 2.6-3.5, PyPy and (possibly still) Jython-2.5.1
+ - runs on Posix/Windows, Python 2.6, 2.7 and 3.3-3.5, PyPy and (possibly still) Jython-2.5.1
- free and open source software, distributed under the terms of the :ref:`MIT license <license>`
- **well tested** with more than a thousand tests against itself
- **strict backward compatibility policy** for safe pytest upgrades
@@ -57,5 +57,3 @@ pytest: helps you write better programs
.. _`easy`: http://bruynooghe.blogspot.com/2009/12/skipping-slow-test-by-default-in-pytest.html
-
-
From 1451a1ab002db532550277cb9e1981af5b35088f Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com>
Date: Thu, 30 Jun 2016 10:03:40 +0200
Subject: [PATCH 4/4] remove unsupported python versions from code/source xfail
---
testing/code/test_source.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/testing/code/test_source.py b/testing/code/test_source.py
index 007ad1433aa..e78f4b2413c 100644
--- a/testing/code/test_source.py
+++ b/testing/code/test_source.py
@@ -385,8 +385,7 @@ def g():
lines = deindent(source.splitlines())
assert lines == ['', 'def f():', ' def g():', ' pass', ' ']
-@pytest.mark.xfail("sys.version_info[:3] < (2,7,0) or "
- "((3,0) <= sys.version_info[:2] < (3,2))")
+@pytest.mark.xfail("sys.version_info[:3] < (2,7,0)")
def test_source_of_class_at_eof_without_newline(tmpdir):
# this test fails because the implicit inspect.getsource(A) below
# does not return the "x = 1" last line.
@@ -656,4 +655,3 @@ def XXX_test_expression_multiline():
'''"""
result = getstatement(1, source)
assert str(result) == "'''\n'''"
-