From 53ab8897fcbe83cb59dbc776fcf57d9707d6f6b2 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Wed, 27 Jul 2022 12:56:47 +0100
Subject: [PATCH] Avoid using py311 with pylint (#100)

---
 .github/workflows/tox.yml | 42 +++++++++------------------------------
 .pre-commit-config.yaml   |  4 ++++
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index f57b788..b43f2ac 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -12,65 +12,41 @@ on:
 jobs:
   build:
     name: ${{ matrix.name }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
 
     strategy:
       fail-fast: false
       matrix:
-        name: [
-          "docs",
-          "py36",
-          "py37",
-          "py38",
-          "py39",
-          "py310",
-          "lint",
-          "packaging",
-        ]
-        os: [
-          "ubuntu-latest",
-        ]
-
         include:
-
           - name: docs
-            python: "3.6"
-            os: ubuntu-latest
+            python: "3.10"
             tox_env: docs
+          - name: "lint"
+            python: "3.10"
+            tox_env: "lint"
+          - name: "packaging"
+            python: "3.10"
+            tox_env: "packaging"
+
           - name: py36
             python: "3.6"
-            os: ubuntu-latest
             tox_env: py36
           - name: py37
             python: "3.7"
-            os: ubuntu-latest
             tox_env: py37
           - name: py38
             python: "3.8"
-            os: ubuntu-latest
             tox_env: py38
           - name: py39
             python: "3.9"
-            os: ubuntu-latest
             tox_env: py39
           - name: py310
             python: "3.10"
-            os: ubuntu-latest
             tox_env: py310
           - name: py311
             python: "~3.11.0-0" # see https://github.com/actions/setup-python/issues/213#issuecomment-1146676713
-            os: ubuntu-latest
             tox_env: py311
 
-          - name: "lint"
-            python: "3.7"
-            os: ubuntu-latest
-            tox_env: "lint"
-          - name: "packaging"
-            python: "3.7"
-            os: ubuntu-latest
-            tox_env: "packaging"
-
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9b75b00..78b936f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,8 @@
 ---
+default_language_version:
+  # Enforce use of py310 because pylint does not support py311 yet, causing
+  # failures for those happening to have that as default python.
+  python: python3.10
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.3.0  # Use the ref you want to point at