Merge pull request #145 from digitronik/py39_gh_action

Py39 and workflows changes

Author: sallner

.github/workflows/lint.yml

@@ -1,12 +1,18 @@
 name: Lint
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+    type: [ "opened", "reopened", "synchronize" ]
 
 env:
   FORCE_COLOR: 1
 
 jobs:
   build:
+    name: pre-commit
     runs-on: ubuntu-latest
 
     steps:
@@ -26,7 +32,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: '3.x'
 
       - name: Install dependencies
         run: |

.github/workflows/test.yml

@@ -1,12 +1,18 @@
 name: Test
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+    type: [ "opened", "reopened", "synchronize" ]
 
 env:
   FORCE_COLOR: 1
 
 jobs:
-  build:
+  tests:
+    name: py-${{ matrix.python-version }}:pytest-${{ matrix.pytest-version }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -15,16 +21,17 @@ jobs:
             "3.6",
             "3.7",
             "3.8",
+            "3.9",
             "pypy3",
         ]
         pytest-version: [
-            "5.0.1",
-            "5.1.3",
-            "5.2.4",
-            "5.3.5",
-            "5.4.3",
-            "6.0.2",
-            "6.1.1",
+            "5.0.*",
+            "5.1.*",
+            "5.2.*",
+            "5.3.*",
+            "5.4.*",
+            "6.0.*",
+            "6.1.*",
         ]
     steps:
       - uses: actions/checkout@v2
@@ -58,3 +65,30 @@ jobs:
         shell: bash
         run: |
           pytest
+
+  platform:
+    # Test devel setup on different platforms.
+    name: Platform-${{ matrix.os }}
+    needs: [ tests ]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+          architecture: 'x64'
+
+      - name: Development setup on platform ${{ matrix.os }}
+        run: |
+          python -m pip install -U pip
+          python -m pip install pytest
+          python -m pip install -e .
+
+      - name: Tests
+        run: pytest

.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 ---
 repos:
     - repo: https://github.com/psf/black
-      rev: 19.10b0
+      rev: 20.8b1
       hooks:
           - id: black
             args: [--safe, --quiet, --target-version, py36]
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v3.1.0
+      rev: v3.4.0
       hooks:
           - id: trailing-whitespace
           - id: end-of-file-fixer
@@ -16,18 +16,18 @@ repos:
           - id: debug-statements
             language_version: python3
     - repo: https://gitlab.com/pycqa/flake8
-      rev: 3.8.3
+      rev: 3.8.4
       hooks:
           - id: flake8
             language_version: python3
             additional_dependencies: [flake8-typing-imports==1.9.0]
     - repo: https://github.com/asottile/reorder_python_imports
-      rev: v2.3.2
+      rev: v2.3.6
       hooks:
           - id: reorder-python-imports
             args: ['--application-directories=.:src', --py3-plus]
     - repo: https://github.com/asottile/pyupgrade
-      rev: v2.7.1
+      rev: v2.7.4
       hooks:
           - id: pyupgrade
             args: [--py36-plus]

README.rst

@@ -19,7 +19,7 @@ Requirements
 
 You will need the following prerequisites in order to use pytest-rerunfailures:
 
-- Python 3.6, up to 3.8, or PyPy3
+- Python 3.6, up to 3.9, or PyPy3
 - pytest 5.0 or newer
 
 This package is currently tested against the last 5 minor pytest releases. In

pytest_rerunfailures.py

@@ -297,15 +297,13 @@ def pytest_runtest_protocol(item, nextitem):
 
 
 def pytest_report_teststatus(report):
-    """Adapted from https://pytest.org/latest/_modules/_pytest/skipping.html
-    """
+    """Adapted from https://pytest.org/latest/_modules/_pytest/skipping.html"""
     if report.outcome == "rerun":
         return "rerun", "R", ("RERUN", {"yellow": True})
 
 
 def pytest_terminal_summary(terminalreporter):
-    """Adapted from https://pytest.org/latest/_modules/_pytest/skipping.html
-    """
+    """Adapted from https://pytest.org/latest/_modules/_pytest/skipping.html"""
     tr = terminalreporter
     if not tr.reportchars:
         return

setup.py

@@ -33,6 +33,7 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",

test_pytest_rerunfailures.py

@@ -32,7 +32,14 @@ def check_outcome_field(outcomes, field_name, expected_value):
 
 
 def assert_outcomes(
-    result, passed=1, skipped=0, failed=0, error=0, xfailed=0, xpassed=0, rerun=0
+    result,
+    passed=1,
+    skipped=0,
+    failed=0,
+    error=0,
+    xfailed=0,
+    xpassed=0,
+    rerun=0,
 ):
     outcomes = result.parseoutcomes()
     check_outcome_field(outcomes, "passed", passed)
@@ -324,7 +331,7 @@ def test_fail_two():
 
 def test_rerun_on_setup_class_with_error_with_reruns(testdir):
     """
-     Case: setup_class throwing error on the first execution for parametrized test
+    Case: setup_class throwing error on the first execution for parametrized test
     """
     testdir.makepyfile(
         """

tox.ini

@@ -11,7 +11,7 @@ max-line-length = 88
 [tox]
 envlist =
     linting
-    py{36,37,38,py3}-pytest{50,51,52,53,54,60,61}
+    py{36,37,38,39,py3}-pytest{50,51,52,53,54,60,61}
 minversion = 3.17.1
 
 [testenv]