Merge pull request #86 from hugovk/rm-eol

Drop support for EOL Python 2.7 and 3.5

Author: flub

.github/workflows/main.yml

@@ -8,10 +8,6 @@ jobs:
       fail-fast: false
       matrix:
         python:
-          - v: "2.7"
-            tox_env: "py27"
-          - v: "3.5"
-            tox_env: "py35"
           - v: "3.6"
             tox_env: "py36"
           - v: "3.7"
@@ -23,12 +19,14 @@ jobs:
             tox_env: "py38"
           - v: "3.9"
             tox_env: "py39"
-          - v: "pypy2"
-            tox_env: "pypy2"
           - v: "3.9"
             tox_env: "linting"
         os: [ubuntu-latest, windows-latest]
     steps:
+      - name: Set Git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
       - uses: actions/checkout@v1
       - name: Set up Python
         uses: actions/setup-python@v1

.pre-commit-config.yaml

@@ -1,17 +1,17 @@
 ---
 repos:
   - repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 20.8b1
     hooks:
       - id: black
-        args: [--safe, --quiet]
+        args: [--safe, --quiet, --target-version, py36]
   - repo: https://github.com/asottile/blacken-docs
-    rev: v1.0.0
+    rev: v1.10.0
     hooks:
       - id: blacken-docs
-        additional_dependencies: [black==19.3b0]
+        additional_dependencies: [black==20.8b1]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.3
+    rev: v3.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -21,7 +21,7 @@ repos:
       - id: debug-statements
         language_version: python3
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.7
+    rev: 3.8.4
     hooks:
       - id: flake8
         language_version: python3
@@ -31,24 +31,24 @@ repos:
     hooks:
       - id: pep257
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.7
+    rev: 3.8.4
     hooks:
       - id: flake8
         language_version: python3
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v1.4.0
+    rev: v2.4.0
     hooks:
       - id: reorder-python-imports
   - repo: https://github.com/asottile/pyupgrade
-    rev: v1.18.0
+    rev: v2.10.0
     hooks:
       - id: pyupgrade
-        args: [--keep-percent-format]
+        args: [--keep-percent-format, --py36-plus]
   - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.4.0
+    rev: v1.8.0
     hooks:
       - id: rst-backticks
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.18.0
+    rev: v1.26.0
     hooks:
       - id: yamllint

README.rst

@@ -43,9 +43,8 @@ hangs.
    stage.  See below for detailed information on the timeout methods
    and their side-effects.
 
-The pytest-timeout plugin has been tested on python 2.7 or higher,
-including 3.X, pypy and pypy3.  See tox.ini for currently tested
-versions.
+The pytest-timeout plugin has been tested on Python 3.6 and higher,
+including PyPy3.  See tox.ini for currently tested versions.
 
 
 Usage

failure_demo.py

@@ -1,8 +1,8 @@
 """Demonstration of timeout failures using pytest_timeout.
 
-To use this demo, invoke py.test on it::
+To use this demo, invoke pytest on it::
 
-   py.test failure_demo.py
+   pytest failure_demo.py
 """
 import threading
 import time

setup.cfg

@@ -1,20 +1,18 @@
 """Setuptools install script for pytest-timeout."""
-import io
-
 from setuptools import setup
 
-with io.open("README.rst", encoding="utf-8") as f:
+with open("README.rst", encoding="utf-8") as f:
     long_description = f.read()
 
 
 setup(
     name="pytest-timeout",
-    description="py.test plugin to abort hanging tests",
+    description="pytest plugin to abort hanging tests",
     long_description=long_description,
     version="1.4.2",
     author="Floris Bruynooghe",
     author_email="[email protected]",
-    url="http://github.com/pytest-dev/pytest-timeout/",
+    url="https://github.com/pytest-dev/pytest-timeout",
     license="MIT",
     py_modules=["pytest_timeout"],
     entry_points={"pytest11": ["timeout = pytest_timeout"]},
@@ -30,9 +28,8 @@
         "Programming Language :: Python",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Programming Language :: Python :: Implementation :: CPython",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",

setup.py

@@ -151,7 +151,7 @@ def test_foo(self, fix):
             scope=scope
         )
     )
-    result = testdir.runpytest("--timeout=1", "--timeout-method={}".format(meth))
+    result = testdir.runpytest("--timeout=1", f"--timeout-method={meth}")
     assert result.ret > 0
     assert "Timeout" in result.stdout.str() + result.stderr.str()
 
@@ -198,7 +198,7 @@ def test_foo(self, fix):
                 pass
     """
     )
-    result = testdir.runpytest("--timeout=1", "-s", "--timeout-method={}".format(meth))
+    result = testdir.runpytest("--timeout=1", "-s", f"--timeout-method={meth}")
     assert result.ret > 0
     assert "Timeout" in result.stdout.str() + result.stderr.str()
 

test_pytest_timeout.py

@@ -3,7 +3,7 @@ minversion = 2.8
 addopts = -ra
 
 [tox]
-envlist = py27,py35,py36,py37,py38,py39,pypy2,pypy3
+envlist = py36,py37,py38,py39,pypy3
 
 [testenv]
 deps = pytest