From 9e67d4542cb0f6933dca1838693564d43760c234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jim=20Br=C3=A4nnlund?= <jim.brannlund@gmail.com>
Date: Thu, 31 Mar 2022 02:45:15 +0200
Subject: [PATCH] Update python versions

---
 .github/workflows/actions.yml | 13 +++++-----
 .github/workflows/nightly.yml |  3 ++-
 .github/workflows/tests.yml   | 45 +++++++++++++++++++----------------
 tox.ini                       |  2 +-
 4 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 6b4a4e36..38a53000 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -20,16 +20,16 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
-        python-version: 3.6
+        python-version: 3.9
     - name: Install tox
       run: python -m pip install --upgrade tox
     - name: Build docs with tox
       run: python -m tox -e docs
 
   tests:
-    uses: pytest-dev/pytest-html/.github/workflows/tests.yml@master
+    uses: ./.github/workflows/tests.yml
 
   publish:
     name: Publish to PyPI registry
@@ -41,14 +41,13 @@ jobs:
       TOXENV: packaging
 
     steps:
-      - name: Switch to using Python 3.6 by default
-        uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
-          python-version: 3.6
+          python-version: 3.9
       - name: Install tox
         run: python -m pip install --user tox
       - name: Check out src from Git
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           # Get shallow Git history (default) for tag creation events
           # but have a complete clone for any other workflows.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index d97d3156..252aa36c 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -6,4 +6,5 @@ on:
 
 jobs:
   tests:
-    uses: pytest-dev/pytest-html/.github/workflows/tests.yml@master
+    if: github.repository_owner == 'pytest-dev'
+    uses: ./.github/workflows/tests.yml
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 04faeaa4..84be7269 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,20 +8,9 @@ jobs:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
-            name: py36-ubuntu
-            python-version: 3.6
-
-          - os: windows-latest
-            name: py36-windows
-            python-version: 3.6
-
-          - os: macOS-latest
-            name: py36-mac
-            python-version: 3.6
-
           - os: ubuntu-latest
             name: py37-ubuntu
             python-version: 3.7
@@ -58,18 +47,30 @@ jobs:
             name: py39-mac
             python-version: 3.9
 
+          - os: ubuntu-latest
+            name: py310-ubuntu
+            python-version: '3.10'
+
+          - os: windows-latest
+            name: py310-windows
+            python-version: '3.10'
+
+          - os: macOS-latest
+            name: py310-mac
+            python-version: '3.10'
+
           - os: ubuntu-latest
             name: pypy3-ubuntu
-            python-version: pypy3
+            python-version: pypy-3.8
 
           - os: windows-latest
             name: pypy3-windows
-            python-version: pypy3
+            python-version: pypy-3.8
 
            # https://github.com/pytest-dev/pytest-html/issues/482
-#          - os: macOS-latest
-#            name: pypy3-mac
-#            python-version: pypy3
+          - os: macOS-latest
+            name: pypy3-mac
+            python-version: pypy-3.8
 
           - os: ubuntu-latest
             name: devel-ubuntu
@@ -78,9 +79,11 @@ jobs:
     steps:
       - name: Set Newline Behavior
         run : git config --global core.autocrlf false
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix['python-version'] }}
       - name: Install tox
@@ -112,9 +115,9 @@ jobs:
     name: grunt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: '12.x'
       - name: Install Dependencies
diff --git a/tox.ini b/tox.ini
index 633d31bb..0d9b6480 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py{36,37,38,39,py3}, docs, linting
+envlist = py{37,38,39,310,py3}, docs, linting
 isolated_build = True
 
 [testenv]