From c762dda1b10d5a4268719c54ac4a7d0d2d93549f Mon Sep 17 00:00:00 2001
From: Safihre <safihre@sabnzbd.org>
Date: Fri, 8 Oct 2021 09:47:37 +0200
Subject: [PATCH] Fix tavern for Python 3.6 and run tests on Python 3.10
 (Linux-only)

---
 .github/workflows/integration_testing.yml | 9 +++++----
 tests/requirements.txt                    | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/integration_testing.yml b/.github/workflows/integration_testing.yml
index b31c4a8..f2c949d 100644
--- a/.github/workflows/integration_testing.yml
+++ b/.github/workflows/integration_testing.yml
@@ -9,15 +9,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
         os: [ubuntu-20.04]
         include:
+          # TODO: Update to 3.10 when all packages are available, currently lxml is missing
           - name: macOS
             os: macos-latest
-            python-version: 3.9
+            python-version: "3.9"
           - name: Windows
             os: windows-latest
-            python-version: 3.9
+            python-version: "3.9"
 
     steps:
     - uses: actions/checkout@v2
@@ -31,7 +32,7 @@ jobs:
     - name: Install Python dependencies
       run: |
         python --version
-        pip install --upgrade pip
+        pip install --upgrade pip wheel
         pip install --upgrade -r requirements.txt
         pip install --upgrade -r tests/requirements.txt
     - name: Test SABnzbd
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 04db7a6..ef8c4ba 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -7,6 +7,7 @@ pytest-httpbin
 pytest-httpserver
 flaky
 xmltodict
-tavern
+tavern<1.16.2; python_version == '3.6'
+tavern; python_version > '3.6'
 tavalidate
 lxml>=4.5.0 # needed by tavalidate