From edddf22c03e5b91f0489ebb36c278d9a6170bea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 4 Sep 2022 13:01:17 +0200 Subject: [PATCH 1/2] Fix poetry dependency --- .github/workflows/test.yml | 3 --- pyproject.toml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5a01e41..e85084a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,9 +54,6 @@ jobs: key: >- cache ${{ secrets.CACHE_DATE }} ${{ env.PY }} ${{ runner.os }} ${{ hashFiles('pyproject.toml') }} ${{ hashFiles('poetry.lock') }} - # HACK python-poetry/poetry#3010 and 3336 workaround for GitHub actions - # and poetry 1.1.2 throwing 'Incorrectly nested style tag found.' - - run: poetry config experimental.new-installer false - run: poetry install # Let tests issue git commits - run: git config --global user.name CI diff --git a/pyproject.toml b/pyproject.toml index 8d017ef..db05d17 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,5 +15,5 @@ pre-commit = "^2.15.0" pytest-xdist = "^2.4.0" [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" From 0b6dfc4f4e2ed943a099c2ccbcfc5b708780abc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 4 Sep 2022 13:38:11 +0200 Subject: [PATCH 2/2] Install poetry with pipx --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e85084a..705ffc4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,8 +39,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Python Poetry Action - uses: abatilo/actions-poetry@v2.1.0 - name: generate cache key PY run: echo "PY=$((python -VV; pip freeze; poetry --version) | sha256sum | cut -d' ' @@ -54,6 +52,7 @@ jobs: key: >- cache ${{ secrets.CACHE_DATE }} ${{ env.PY }} ${{ runner.os }} ${{ hashFiles('pyproject.toml') }} ${{ hashFiles('poetry.lock') }} + - run: pipx install poetry - run: poetry install # Let tests issue git commits - run: git config --global user.name CI