From 4422999b66718af2420befa79e3dd9ce0112c7c6 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Tue, 2 Mar 2021 13:48:12 +0100
Subject: [PATCH 01/29] CI - add Python 3.10

---
 .github/workflows/python-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index e01dd108..532c988f 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -14,11 +14,13 @@ jobs:
 
     strategy:
       matrix:
+        # https://github.com/actions/python-versions/blob/main/versions-manifest.json
         python-version:
         - "3.6"
         - "3.7"
         - "3.8"
         - "3.9"
+        - "3.10"
 
     steps:
     - uses: actions/checkout@v2

From fd3ca7d90254e8f0777710b1e2613a1ad3b580f7 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Tue, 2 Mar 2021 14:00:51 +0100
Subject: [PATCH 02/29] Use 3.10.0-alpha

And actions/setup-python@v2
---
 .github/workflows/python-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 532c988f..e0078a95 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -20,12 +20,12 @@ jobs:
         - "3.7"
         - "3.8"
         - "3.9"
-        - "3.10"
+        - "3.10.0-alpha"
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     

From 8c388af599f828681d7e645fc6a6d600b9d778da Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Tue, 2 Mar 2021 14:08:05 +0100
Subject: [PATCH 03/29] Use 3.10.0-alpha.5

---
 .github/workflows/python-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index e0078a95..4a21ce4e 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -20,7 +20,7 @@ jobs:
         - "3.7"
         - "3.8"
         - "3.9"
-        - "3.10.0-alpha"
+        - "3.10.0-alpha.5"
 
     steps:
     - uses: actions/checkout@v2

From dd6a411ce2590701c98b6f4ee33a19dbcd0ce474 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 10:44:22 +0100
Subject: [PATCH 04/29] Install Poetry via curl

---
 .github/workflows/python-ci.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 4a21ce4e..d10f5e43 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -29,12 +29,17 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     
+      # https://python-poetry.org/docs/#installation
     - name: Install Poetry
-      uses: snok/install-poetry@v1.1.1
-      with:
-        version: 1.1.4
-        virtualenvs-create: true
-        virtualenvs-in-project: true
+      env:
+        # https://python-poetry.org/docs/configuration/#using-environment-variables
+        POETRY_VERSION: 1.1.4
+        POETRY_NO_INTERACTION: 1
+        POETRY_VIRTUALENVS_CREATE: 1
+        POETRY_VIRTUALENVS_IN_PROJECT: 1
+      run: |
+        curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
+        poetry config --list
 
     - name: Poetry details
       run: |

From 5bed3be54cbc210236860e290ef81f2710adf4e7 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 10:46:36 +0100
Subject: [PATCH 05/29] Run "source $HOME/.poetry/env"

---
 .github/workflows/python-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index d10f5e43..e1af4ee3 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -39,6 +39,8 @@ jobs:
         POETRY_VIRTUALENVS_IN_PROJECT: 1
       run: |
         curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
+        source $HOME/.poetry/env
+
         poetry config --list
 
     - name: Poetry details

From 4cd2c668c93d21c8703277a2cd5bd1d99e760923 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 10:49:27 +0100
Subject: [PATCH 06/29] Update python-ci.yml

---
 .github/workflows/python-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index e1af4ee3..36fe6d4a 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -40,6 +40,7 @@ jobs:
       run: |
         curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
         source $HOME/.poetry/env
+        env | sort
 
         poetry config --list
 

From eeccebd7938e6d4ae7a82258b4bfde55f6eb59aa Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 10:52:30 +0100
Subject: [PATCH 07/29] Make poetry discoverable within $PATH

---
 .github/workflows/python-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 36fe6d4a..2132c5b0 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -39,8 +39,9 @@ jobs:
         POETRY_VIRTUALENVS_IN_PROJECT: 1
       run: |
         curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
-        source $HOME/.poetry/env
-        env | sort
+
+        # make poetry discoverable within $PATH
+        sudo ln -s $HOME/.poetry/bin/poetry /usr/local/bin/poetry
 
         poetry config --list
 

From fc390fb98b29854d3baa51aafd87450befa9038c Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 10:57:05 +0100
Subject: [PATCH 08/29] pip install cleo

---
 .github/workflows/python-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 2132c5b0..adeeb01f 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -38,6 +38,7 @@ jobs:
         POETRY_VIRTUALENVS_CREATE: 1
         POETRY_VIRTUALENVS_IN_PROJECT: 1
       run: |
+        pip install cleo
         curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
 
         # make poetry discoverable within $PATH

From f6f71314e1b325abc73efd14b3803ff26883fe54 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 12:04:03 +0100
Subject: [PATCH 09/29] Try "pip install --user poetry"

---
 .github/workflows/python-ci.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index adeeb01f..5549428f 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -38,12 +38,7 @@ jobs:
         POETRY_VIRTUALENVS_CREATE: 1
         POETRY_VIRTUALENVS_IN_PROJECT: 1
       run: |
-        pip install cleo
-        curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
-
-        # make poetry discoverable within $PATH
-        sudo ln -s $HOME/.poetry/bin/poetry /usr/local/bin/poetry
-
+        pip install --user poetry
         poetry config --list
 
     - name: Poetry details

From 352a46988510f5ce71d84d23c36c9c64b7290f24 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 12:05:52 +0100
Subject: [PATCH 10/29] Update python-ci.yml

---
 .github/workflows/python-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 5549428f..aad8c6a8 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -39,6 +39,8 @@ jobs:
         POETRY_VIRTUALENVS_IN_PROJECT: 1
       run: |
         pip install --user poetry
+        ln -s ~/.local/bin/poetry /usr/local/bin/poetry
+
         poetry config --list
 
     - name: Poetry details

From fee9ba48d3f4500ece1659a44985ce3a11bea739 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 12:08:00 +0100
Subject: [PATCH 11/29] sudo ln -s ~/.local/bin/poetry /usr/local/bin/poetry

---
 .github/workflows/python-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index aad8c6a8..0a110d60 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -39,7 +39,7 @@ jobs:
         POETRY_VIRTUALENVS_IN_PROJECT: 1
       run: |
         pip install --user poetry
-        ln -s ~/.local/bin/poetry /usr/local/bin/poetry
+        sudo ln -s ~/.local/bin/poetry /usr/local/bin/poetry
 
         poetry config --list
 

From 48016d126957566aac749dd935ee578794b2b13c Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 12:12:16 +0100
Subject: [PATCH 12/29] Update python-ci.yml

---
 .github/workflows/python-ci.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 0a110d60..e615e390 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -28,7 +28,14 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    
+
+    - name: Load cached Poetry venv
+      uses: actions/cache@v2
+      with:
+        path: .venv
+        key: venv-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
+        restore-keys: venv-${{ matrix.python-version }}-
+
       # https://python-poetry.org/docs/#installation
     - name: Install Poetry
       env:
@@ -38,9 +45,7 @@ jobs:
         POETRY_VIRTUALENVS_CREATE: 1
         POETRY_VIRTUALENVS_IN_PROJECT: 1
       run: |
-        pip install --user poetry
-        sudo ln -s ~/.local/bin/poetry /usr/local/bin/poetry
-
+        pip install poetry
         poetry config --list
 
     - name: Poetry details
@@ -48,13 +53,6 @@ jobs:
         poetry --version
         poetry config --list
 
-    - name: Load cached Poetry venv
-      uses: actions/cache@v2
-      with:
-        path: .venv
-        key: v2-venv-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
-        restore-keys: v2-venv-${{ matrix.python-version }}-
-
     - name: Install dependencies with poetry
       run: |
         poetry install

From a817d20d183c6da2eaf8de1191615e3ae5f0553e Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 12:15:15 +0100
Subject: [PATCH 13/29] pip install wheel poetry

---
 .github/workflows/python-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index e615e390..a13b89f7 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -45,7 +45,7 @@ jobs:
         POETRY_VIRTUALENVS_CREATE: 1
         POETRY_VIRTUALENVS_IN_PROJECT: 1
       run: |
-        pip install poetry
+        pip install wheel poetry
         poetry config --list
 
     - name: Poetry details

From 865d2216175a31c0d7df0348199986f82c4c073c Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 12:19:37 +0100
Subject: [PATCH 14/29] pip install wheel

---
 .github/workflows/python-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index a13b89f7..f9b40c2a 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -28,6 +28,7 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+    - run: pip install wheel
 
     - name: Load cached Poetry venv
       uses: actions/cache@v2
@@ -45,7 +46,7 @@ jobs:
         POETRY_VIRTUALENVS_CREATE: 1
         POETRY_VIRTUALENVS_IN_PROJECT: 1
       run: |
-        pip install wheel poetry
+        pip install poetry
         poetry config --list
 
     - name: Poetry details
@@ -55,7 +56,7 @@ jobs:
 
     - name: Install dependencies with poetry
       run: |
-        poetry install
+        poetry install --no-root --no-interactive
         poetry run python --version
         poetry show
 

From 2262b3d536e9fd4a3f7607d61b96208e7ec26078 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 12:32:30 +0100
Subject: [PATCH 15/29] Update python-ci.yml

---
 .github/workflows/python-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 88450f53..8a625793 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -51,7 +51,7 @@ jobs:
 
     - name: Install dependencies with poetry
       run: |
-        poetry install --no-root --no-interactive
+        poetry install --no-root
         poetry run python --version
         poetry show
 

From 66e8142ea7d2903dffb15863c4dcbc743fb656fa Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 12:35:18 +0100
Subject: [PATCH 16/29] Update python-ci.yml

---
 .github/workflows/python-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 8a625793..6dabd8a2 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -28,8 +28,11 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - run: pip install wheel
-    
+    - run: |
+        pip install wheel
+        # try to install all required dependencies (Py 3.10 fix)
+        pip install poetry
+
     - name: Install Poetry
       uses: snok/install-poetry@v1.1.1
       with:

From ab49d66323a7245a1b4aa696967243f304f8eef0 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 12:40:48 +0100
Subject: [PATCH 17/29] Update python-ci.yml

---
 .github/workflows/python-ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 6dabd8a2..6ef36146 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -50,7 +50,12 @@ jobs:
       with:
         path: .venv
         key: v2-venv-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
-        restore-keys: v2-venv-${{ matrix.python-version }}-
+
+    - name: Load .cache directory
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache
+        key: cache-${{ matrix.python-version }}
 
     - name: Install dependencies with poetry
       run: |

From 4fb37001b426b99f6cbb5278a5307f21535e0336 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 12:44:32 +0100
Subject: [PATCH 18/29] Update python-ci.yml

---
 .github/workflows/python-ci.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 6ef36146..039ae662 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -28,6 +28,13 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+
+    - name: Load ~/.cache directory
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache
+        key: cache-${{ matrix.python-version }}
+        
     - run: |
         pip install wheel
         # try to install all required dependencies (Py 3.10 fix)
@@ -51,12 +58,6 @@ jobs:
         path: .venv
         key: v2-venv-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
 
-    - name: Load .cache directory
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache
-        key: cache-${{ matrix.python-version }}
-
     - name: Install dependencies with poetry
       run: |
         poetry install --no-root

From e5994467c08c60bf57002b95c5e5290c63a58ef5 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 12:48:46 +0100
Subject: [PATCH 19/29] Update python-ci.yml

---
 .github/workflows/python-ci.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 039ae662..37662694 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -34,11 +34,8 @@ jobs:
       with:
         path: ~/.cache
         key: cache-${{ matrix.python-version }}
-        
-    - run: |
-        pip install wheel
-        # try to install all required dependencies (Py 3.10 fix)
-        pip install poetry
+
+    - run: pip install wheel
 
     - name: Install Poetry
       uses: snok/install-poetry@v1.1.1

From ee84bf21347b17930db4f152c94169d7b807ad7a Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 13:19:08 +0100
Subject: [PATCH 20/29] Install poetry via pip

---
 .github/workflows/python-ci.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 7dabf210..ce691db3 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -40,12 +40,11 @@ jobs:
     - name: Install Python wheel support to speed up things
       run: pip install wheel
 
-    - name: Install Poetry
-      uses: snok/install-poetry@v1.1.1
-      with:
-        version: 1.1.5
-        virtualenvs-create: true
-        virtualenvs-in-project: true
+    - name: Install and set up Poetry
+      run: |
+        pip install poetry==1.1.5
+        poetry config virtualenvs.create true
+        poetry config virtualenvs.in-project true
 
     - name: Poetry details
       run: |

From 704e3239c4302b36cec9ec66a679249666451549 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 13:31:12 +0100
Subject: [PATCH 21/29] Add poetry.lock hash to the cache key

---
 .github/workflows/python-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index ce691db3..4eb5c810 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -35,7 +35,7 @@ jobs:
         path: |
           ~/.cache
           .venv
-        key: cache-${{ matrix.python-version }}
+        key: cache-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
 
     - name: Install Python wheel support to speed up things
       run: pip install wheel

From 54f878bd591901ace8a9805ca06ea625be345980 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 4 Mar 2021 16:18:31 +0100
Subject: [PATCH 22/29] Pre-install black

  EnvCommandError

  Command ['/home/runner/work/sql-metadata/sql-metadata/.venv/bin/pip', 'install', '--no-deps', '/home/runner/.cache/pypoetry/artifacts/64/08/ea/6fcac08da010d65557566f4f78be903d17d7f7ae66e7584e4334a8bb6e/dataclasses-0.8-py3-none-any.whl'] errored with the following return code 1, and output:
  Processing /home/runner/.cache/pypoetry/artifacts/64/08/ea/6fcac08da010d65557566f4f78be903d17d7f7ae66e7584e4334a8bb6e/dataclasses-0.8-py3-none-any.whl
  ERROR: Package 'dataclasses' requires a different Python: 3.10.0 not in '<3.7,>=3.6'
---
 .github/workflows/python-ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 4eb5c810..369aa35e 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -35,11 +35,15 @@ jobs:
         path: |
           ~/.cache
           .venv
-        key: cache-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
+        key: cache-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}-v1
 
     - name: Install Python wheel support to speed up things
       run: pip install wheel
 
+    # this prevents issues with Python 3.10 when poetry tries to install black's dependency "dataclasses"
+    - name: Pre-install black
+      run: pip install black
+
     - name: Install and set up Poetry
       run: |
         pip install poetry==1.1.5

From f766450085ae4bc22178963fc0587c14cebdb29f Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 15 Apr 2021 17:50:13 +0200
Subject: [PATCH 23/29] pip install poetry==1.1.6

---
 .github/workflows/python-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 6b82471e..4b4dbc01 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -46,7 +46,7 @@ jobs:
 
     - name: Install and set up Poetry
       run: |
-        pip install poetry==1.1.5
+        pip install poetry==1.1.6
         poetry config virtualenvs.create true
         poetry config virtualenvs.in-project true
 

From 681115e8d03ecabd63e409d0d26d44608d1ea9a9 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Sat, 22 May 2021 22:37:09 +0100
Subject: [PATCH 24/29] Update python-ci.yml

https://github.com/snok/install-poetry/pull/33 + https://github.com/snok/install-poetry/pull/35
---
 .github/workflows/python-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 80960c74..14343fe8 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -45,7 +45,7 @@ jobs:
 
     # https://github.com/marketplace/actions/install-poetry-action
     - name: Install Poetry
-      uses: snok/install-poetry@v1.1.3
+      uses: snok/install-poetry@v1.1.6
       with:
         virtualenvs-create: true
         virtualenvs-in-project: true

From e8a00a592df8e4abdad87986a1c3f90c15b6596b Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Tue, 22 Jun 2021 10:18:06 +0100
Subject: [PATCH 25/29] 3.10.0-beta.3

---
 .github/workflows/python-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 14343fe8..e78a2b8f 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -20,7 +20,7 @@ jobs:
         - "3.7"
         - "3.8"
         - "3.9"
-        - "3.10.0-alpha.5"
+        - "3.10.0-beta.3"
 
     steps:
     - uses: actions/checkout@v2

From e082d06ff4ef82d6766cfc99764295e47962e94d Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Thu, 1 Jul 2021 09:22:59 +0100
Subject: [PATCH 26/29] Use Poetry 1.1.7

---
 .github/workflows/python-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 1fb6bf69..243807f5 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -47,6 +47,7 @@ jobs:
     - name: Install Poetry
       uses: snok/install-poetry@v1.1.6
       with:
+        version: 1.1.7
         virtualenvs-create: true
         virtualenvs-in-project: true
 

From aa89be89608b037f579a2e4e66d43a5de900d80f Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Fri, 23 Jul 2021 18:35:22 +0100
Subject: [PATCH 27/29] Use 3.10.0-beta.4

---
 .github/workflows/python-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 243807f5..3d93aca7 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -20,7 +20,7 @@ jobs:
         - "3.7"
         - "3.8"
         - "3.9"
-        - "3.10.0-beta.3"
+        - "3.10.0-beta.4"
 
     steps:
     - uses: actions/checkout@v2

From f02da7192d050fb511d2b76250b7433eb1a69f38 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Tue, 10 Aug 2021 10:45:25 +0100
Subject: [PATCH 28/29] 3.10.0-rc.1

---
 .github/workflows/python-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 3d93aca7..02145a10 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -20,7 +20,7 @@ jobs:
         - "3.7"
         - "3.8"
         - "3.9"
-        - "3.10.0-beta.4"
+        - "3.10.0-rc.1"
 
     steps:
     - uses: actions/checkout@v2

From d3be4e161e345693e74d4ecb03fe8325231a60f4 Mon Sep 17 00:00:00 2001
From: Maciej Brencz <maciej.brencz@gmail.com>
Date: Mon, 18 Oct 2021 11:29:53 +0100
Subject: [PATCH 29/29] Python 3.10 has just been released!

https://docs.python.org/3/whatsnew/3.10.html
---
 .github/workflows/python-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 3d1d842d..069e956b 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -20,7 +20,7 @@ jobs:
         - "3.7"
         - "3.8"
         - "3.9"
-        - "3.10.0-rc.1"
+        - "3.10"
 
     steps:
     - uses: actions/checkout@v2