Merge pull request #1678 from RonnyPfannschmidt/drop-python30-32

drop python 3.0-3.2 support code from setup.py

CHANGELOG.rst

@@ -27,10 +27,12 @@
 
   Thanks to `@RedBeardCode`_ for the PR(`#1664`_)
 
+* 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
 .. _#1664: https://github.com/pytest-dev/pytest/pull/1664
+.. _#1627: https://github.com/pytest-dev/pytest/pull/1627
 
 
 2.10.0.dev1

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;
 

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
-
-

setup.py

@@ -13,7 +13,7 @@ classifiers = ['Development Status :: 6 - Mature',
                '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')

testing/code/test_source.py

@@ -385,8 +385,7 @@ def test_deindent():
     lines = deindent(source.splitlines())
     assert lines == ['', 'def f():', '    def g():', '        pass', '    ']
 
-@pytest.mark.xfail("sys.version_info[:3] < (2,7,0) or "
+@pytest.mark.xfail("sys.version_info[:3] < (2,7,0)")
-    "((3,0) <= sys.version_info[:2] < (3,2))")
 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 @@ something
 '''"""
     result = getstatement(1, source)
     assert str(result) == "'''\n'''"
-