From 851734fb4a8456304fa1c4dc8525b8b05e195dce Mon Sep 17 00:00:00 2001
From: "Tobias Wellnitz, DH1TW" <tobias@dh1tw.de>
Date: Sat, 1 Mar 2025 22:56:34 +0100
Subject: [PATCH] include again 3.6 and 3.7

---
 .github/workflows/test.yml | 49 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6a54e60..042d5f6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,6 +3,51 @@ name: Linux
 on: [push, pull_request]
 
 jobs:
+  test_linux_legacy:
+      # Ubuntu 20.04 is still required for python 3.6; this doesn't work on Ubuntu 22.04 anymore
+      runs-on: "ubuntu-20.04"
+      name: "Ubuntu 20.04 - Python ${{ matrix.python-version }}"
+      strategy:
+        matrix:
+          python-version: ["3.6"]
+          redis-version: [6]
+  
+      steps:
+        - uses: "actions/checkout@v3"
+        - uses: "actions/setup-python@v4"
+          with:
+            python-version: "${{ matrix.python-version }}"
+            cache: "pip"
+            cache-dependency-path: |
+              **/setup.py
+              **/requirements*.txt
+  
+        - name: "Install dependencies"
+          run: |
+            set -xe
+            sudo apt-get install -y libxml2-dev libxslt-dev
+            python -VV
+            python -m pip install --upgrade pip setuptools
+            python -m pip install -e .
+            python -m pip install -r requirements-pytest.txt
+  
+        - name: Start Redis
+          uses: supercharge/redis-github-action@1.2.0
+          with:
+            redis-version: ${{ matrix.redis-version }}
+  
+        - name: "Run tests for ${{ matrix.python-version }}"
+          env: 
+            CLUBLOG_APIKEY: ${{ secrets.CLUBLOG_APIKEY }}
+            QRZ_USERNAME: ${{ secrets.QRZ_USERNAME }}
+            QRZ_PWD: ${{ secrets.QRZ_PWD }}
+            PYTHON_VERSION: ${{ matrix.python-version }}
+          # delay the execution randomly by a couple of seconds to reduce the amount 
+          # of concurrent API calls on Clublog and QRZ.com when all CI jobs execute simultaneously
+          run: |
+            sleep $[ ( $RANDOM % 10 )  + 1 ]s 
+            pytest ./test
+
   test_linux:
     runs-on: "ubuntu-22.04"
     name: "Ubuntu 22.04 - Python ${{ matrix.python-version }}"
@@ -11,7 +56,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.8", "pypy3.9", "pypy3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.8", "pypy3.9", "pypy3.10", "pypy3.11"]
         redis-version: [6]
 
     steps:
@@ -76,7 +121,7 @@ jobs:
     name: "MacOS 12 - Python ${{ matrix.python-version }}"
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.8", "pypy3.9", "pypy3.10"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.8", "pypy3.9", "pypy3.10", "pypy3.11"]
         redis-version: [6]
 
     steps: