Merging upstream version 1.9.4.

Signed-off-by: Daniel Baumann <daniel@debian.org>

.github/workflows/test.yaml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-16.04]
-        python: ['3.6', '3.7', '3.8']
+        python: ['3.6', '3.7', '3.8', '3.9']
         redis: [5, 6]
     runs-on: ${{ matrix.os }}
 
@@ -25,21 +25,21 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
           architecture: 'x64'
       - name: Cache venv
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: venv
           # Look to see if there is a cache hit for the corresponding requirements file
-          key: ${{ matrix.os }}-poetryenv-${{ 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
+          pip install -U pip==21.1 setuptools
           pip install poetry
           poetry install
           python -c "import sys; print(sys.version)"
@@ -49,7 +49,7 @@ jobs:
           REDIS_VERSION: ${{ matrix.redis }}
         run: |
           . venv/bin/activate
-          pytest
+          pytest || cat cli_test.log
   lint:
     name: flake8 & black
     runs-on: ubuntu-16.04
@@ -61,7 +61,7 @@ jobs:
           python-version: 3.7
           architecture: 'x64'
       - name: Cache venv
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: venv
           # Look to see if there is a cache hit for the corresponding requirements file