Merge branch 'master' into ck-fixci

.github/workflows/integration.yml

@@ -35,19 +35,7 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{env.basepython}}
-
-#      - name: Cache paths
-#        uses: actions/cache@v2
-#        with:
-#          path: |
-#            .tox
-#            ~/.virtualenvs
-#            ~/.cache/pip
-#            ~/.cache/pypoetry
-#          key: lint-${{ hashFiles('**/poetry.lock', '**/tox.ini', '**/pyproject.toml') }}-${{ matrix.python-version}}
-#          restore-keys: |
-#            lint-${{ hashFiles('**/poetry.lock', '**/tox.ini', '**/pyproject.toml') }}-${{ matrix.python-version}}
-
+
       - name: prepare the environment
         run: |
           pip install -U setuptools pip poetry==1.3.2 tox-poetry
@@ -58,31 +46,19 @@ jobs:
 
   tests:
     name: Test on ${{ matrix.platform }} with Python ${{ matrix.python }}
-    runs-on: ${{ matrix.platform }}
+    runs-on: ubuntu-latest
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
     strategy:
       matrix:
-        platform: ['ubuntu-20.04']
         python: ['3.7', '3.8', '3.9', '3.10', '3.11']
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: ${{matrix.python-version}}
-#      - name: Cache paths
-#        uses: actions/cache@v2
-#        with:
-#          path: |
-#            .tox
-#            ~/.virtualenvs
-#            ~/.cache/pip
-#            ~/.cache/pypoetry
-#          key: cover-${{ hashFiles('**/poetry.lock', '**/tox.ini', '**/pyproject.toml') }}-${{ matrix.python-version}}
-#          restore-keys: |
-#            cover-${{ hashFiles('**/poetry.lock', '**/tox.ini', '**/pyproject.toml') }}-${{ matrix.python-version}}
+          python-version: ${{matrix.python}}
 
       - name: Prepare environment
         run: |