From 751509588185b654a4d22a0d862a91ea97cf7067 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Thu, 5 Sep 2024 10:25:33 +0200 Subject: [PATCH 1/2] Do not install poetry in install-dev make target --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 2be5ca57..961bb3e1 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,6 @@ clean: rm -rf .mypy_cache .pytest_cache .ruff_cache build dist htmlcov .coverage install-dev: - python3 -m pip install --upgrade pip poetry poetry install --all-extras poetry run pre-commit install From a9870ca9d7c4e1e1213dd52f62a304f47e1a076b Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Thu, 5 Sep 2024 10:44:01 +0200 Subject: [PATCH 2/2] Install poetry in CI --- .github/workflows/check_version_availability.yaml | 4 +++- .github/workflows/docs.yaml | 6 ++++-- .github/workflows/integration_tests.yaml | 4 +++- .github/workflows/lint_and_type_checks.yaml | 4 +++- .github/workflows/release.yaml | 4 +++- .github/workflows/unit_tests.yaml | 4 +++- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/check_version_availability.yaml b/.github/workflows/check_version_availability.yaml index 977866f3..93d82839 100644 --- a/.github/workflows/check_version_availability.yaml +++ b/.github/workflows/check_version_availability.yaml @@ -23,7 +23,9 @@ jobs: python-version: "3.9" - name: Install dependencies - run: make install-dev + run: | + pipx install poetry + make install-dev - name: Check version availability run: make check-version-availability diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 1c00e0a5..0a231e26 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -50,8 +50,10 @@ jobs: with: python-version: 3.9 - - name: Install Python dependencies - run: make install-dev + - name: Install dependencies + run: | + pipx install poetry + make install-dev - name: Build generated API reference run: make build-api-reference diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml index af2b7881..d96a2dda 100644 --- a/.github/workflows/integration_tests.yaml +++ b/.github/workflows/integration_tests.yaml @@ -35,7 +35,9 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies - run: make install-dev + run: | + pipx install poetry + make install-dev - name: Run integration tests run: make INTEGRATION_TESTS_CONCURRENCY=8 integration-tests diff --git a/.github/workflows/lint_and_type_checks.yaml b/.github/workflows/lint_and_type_checks.yaml index 83ddd644..a89eca37 100644 --- a/.github/workflows/lint_and_type_checks.yaml +++ b/.github/workflows/lint_and_type_checks.yaml @@ -25,7 +25,9 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies - run: make install-dev + run: | + pipx install poetry + make install-dev - name: Run lint run: make lint diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4b84ba92..9ccaa91e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -69,7 +69,9 @@ jobs: python-version: 3.9 - name: Install dependencies - run: make install-dev + run: | + pipx install poetry + make install-dev - # Determine if this is a prerelease or latest release name: Determine release type diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index 02828eed..ccb5f6ed 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -26,7 +26,9 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies - run: make install-dev + run: | + pipx install poetry + make install-dev - name: Run unit tests run: make unit-tests