Merge pull request #7835 from asottile/py36_misc

py36+: miscellaneous (3, 6) cleanup

doc/en/skipping.rst

@@ -91,7 +91,7 @@ when run on an interpreter earlier than Python3.6:
     import sys
 
 
-    @pytest.mark.skipif(sys.version_info < (3, 6), reason="requires python3.6 or higher")
+    @pytest.mark.skipif(sys.version_info < (3, 7), reason="requires python3.7 or higher")
     def test_function():
         ...
 

src/_pytest/capture.py

@@ -113,11 +113,7 @@ def _py36_windowsconsoleio_workaround(stream: TextIO) -> None:
 
     See https://github.com/pytest-dev/py/issues/103.
     """
-    if (
+    if not sys.platform.startswith("win32") or hasattr(sys, "pypy_version_info"):
-        not sys.platform.startswith("win32")
-        or sys.version_info[:2] < (3, 6)
-        or hasattr(sys, "pypy_version_info")
-    ):
         return
 
     # Bail out if ``stream`` doesn't seem like a proper ``io`` stream (#2666).

src/_pytest/compat.py

@@ -87,9 +87,7 @@ def iscoroutinefunction(func: object) -> bool:
 def is_async_function(func: object) -> bool:
     """Return True if the given function seems to be an async function or
     an async generator."""
-    return iscoroutinefunction(func) or (
+    return iscoroutinefunction(func) or inspect.isasyncgenfunction(func)
-        sys.version_info >= (3, 6) and inspect.isasyncgenfunction(func)
-    )
 
 
 def getlocation(function, curdir: Optional[str] = None) -> str:

testing/acceptance_test.py

@@ -1180,9 +1180,6 @@ def test_warn_on_async_function(testdir):
 
 
 @pytest.mark.filterwarnings("default")
-@pytest.mark.skipif(
-    sys.version_info < (3, 6), reason="async gen syntax available in Python 3.6+"
-)
 def test_warn_on_async_gen_function(testdir):
     testdir.makepyfile(
         test_async="""

testing/test_capture.py

@@ -1421,8 +1421,7 @@ def test_error_attribute_issue555(testdir):
 
 
 @pytest.mark.skipif(
-    not sys.platform.startswith("win") and sys.version_info[:2] >= (3, 6),
+    not sys.platform.startswith("win"), reason="only on windows",
-    reason="only py3.6+ on windows",
 )
 def test_py36_windowsconsoleio_workaround_non_standard_streams() -> None:
     """

testing/test_compat.py

@@ -1,5 +1,4 @@
 import enum
-import sys
 from functools import partial
 from functools import wraps
 from typing import TYPE_CHECKING
@@ -129,9 +128,6 @@ def test_is_generator_async_syntax(testdir):
     result.stdout.fnmatch_lines(["*1 passed*"])
 
 
-@pytest.mark.skipif(
-    sys.version_info < (3, 6), reason="async gen syntax available in Python 3.6+"
-)
 def test_is_generator_async_gen_syntax(testdir):
     testdir.makepyfile(
         """