From dd874ab02db04853d4b5952712ab34693f9a93de Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 4 Jan 2023 08:19:36 +0100
Subject: Merging upstream version 1.13.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/workflows/release.yaml           |  2 +-
 .github/workflows/test-binary-build.yaml |  2 +-
 .github/workflows/test.yaml              | 22 ++++++++++++----------
 3 files changed, 14 insertions(+), 12 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index b41b835..2e27a96 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -89,7 +89,7 @@ jobs:
         run: |
           python3 -m venv venv
           . venv/bin/activate
-          pip install pip==21.1
+          pip install pip
           pip install poetry
           poetry install
           python -c "import sys; print(sys.version)"
diff --git a/.github/workflows/test-binary-build.yaml b/.github/workflows/test-binary-build.yaml
index 8d0a5fe..11e720a 100644
--- a/.github/workflows/test-binary-build.yaml
+++ b/.github/workflows/test-binary-build.yaml
@@ -36,7 +36,7 @@ jobs:
         run: |
           python3 -m venv venv
           . venv/bin/activate
-          pip install pip==21.1
+          pip install pip
           pip install poetry
           poetry install
           python -c "import sys; print(sys.version)"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 114c3b7..01a9dfd 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -11,8 +11,8 @@ jobs:
     name: Pytest
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        python: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        os: ["ubuntu-20.04"]
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11.1"]
         redis: [5, 6, 7]
     runs-on: ${{ matrix.os }}
 
@@ -25,21 +25,23 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
-          architecture: 'x64'
+          architecture: "x64"
       - name: Cache venv
         uses: actions/cache@v2
         with:
           path: venv
           # Look to see if there is a cache hit for the corresponding requirements file
-          key: poetryenv-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('poetry.lock') }}
+          key:
+            poetryenv-${{ matrix.os }}-${{ matrix.python }}-${{
+            hashFiles('poetry.lock') }}
       - name: Install Dependencies
         run: |
           python3 -m venv venv
           . venv/bin/activate
-          pip install -U pip==21.1 setuptools
+          pip install -U pip setuptools
           pip install poetry
           poetry install
           python -c "import sys; print(sys.version)"
@@ -58,12 +60,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: codespell-project/actions-codespell@master
         with:
-          ignore_words_list: fo,ists,oll,optin,ot,smove,tre,whe
-          exclude_file: docs/assets/demo.svg
-      - uses: actions/setup-python@v1
+          ignore_words_list: fo,ists,oll,optin,ot,smove,tre,whe,EXAT,exat
+          skip: ./docs/assets/demo.svg,./iredis/data/commands.json,./iredis/data/commands/*,./tests/unittests/*
+      - uses: actions/setup-python@v4
         with:
           python-version: 3.7
-          architecture: 'x64'
+          architecture: "x64"
       - name: Cache venv
         uses: actions/cache@v2
         with:
-- 
cgit v1.2.3