From 1edd2a7db592ab83003e05075dfce7b5baa37232 Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <vkarak@gmail.com>
Date: Mon, 5 Dec 2022 21:19:41 +0100
Subject: [PATCH 1/2] Add support for Python 3.11 + fix GH actions

---
 .github/workflows/main.yml | 15 ++++++++++++++-
 setup.cfg                  |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index aecfde9036..1d64d1e9c4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -33,6 +33,19 @@ jobs:
       with:
         fail_ci_if_error: true
 
+  unittest-py36:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: read
+    container:
+      image: "reframehpc/rfm-ci-ubuntu-py36:latest"
+      options: "--platform=linux/amd64 --user root -it --init"
+    steps:
+      - name: Run Python 3.6 unit tests
+        run: |
+          cd /reframe
+          ./test_reframe.py -v
+
   unittest-macos:
     runs-on: macos-latest
     steps:
diff --git a/setup.cfg b/setup.cfg
index 180967c4cc..ac7ef069f5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,6 +14,7 @@ classifiers =
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     License :: OSI Approved :: BSD License
     Operating System :: MacOS
     Operating System :: POSIX :: Linux

From 1fa160e149496d2ef8282de9b063af199679ffed Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <vkarak@gmail.com>
Date: Tue, 6 Dec 2022 21:10:36 +0100
Subject: [PATCH 2/2] Address PR comments

---
 .github/workflows/main.yml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1d64d1e9c4..8c625300e8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,17 +34,22 @@ jobs:
         fail_ci_if_error: true
 
   unittest-py36:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: read
-    container:
-      image: "reframehpc/rfm-ci-ubuntu-py36:latest"
-      options: "--platform=linux/amd64 --user root -it --init"
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        python-version: ['3.6']
     steps:
-      - name: Run Python 3.6 unit tests
-        run: |
-          cd /reframe
-          ./test_reframe.py -v
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        ./bootstrap.sh
+    - name: Generic Unittests
+      run: |
+        ./test_reframe.py
 
   unittest-macos:
     runs-on: macos-latest