diff --git a/.github/workflows/build_pypi.yml b/.github/workflows/build_pypi.yml index 97c662d5..44b5ffe2 100644 --- a/.github/workflows/build_pypi.yml +++ b/.github/workflows/build_pypi.yml @@ -63,7 +63,9 @@ jobs: sed -i "s/^version[ ]*=.*/version = \"${version}\"/g" ${{ env.PYTHON_VERSION_FILE }} - name: "Install poetry" - run: pipx install poetry + env: + POETRY_VERSION: ${{ vars.POETRY_VERSION }} + run: pipx install "poetry==${POETRY_VERSION}" - name: "Set up Python" id: setup_python diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 2043f074..783b955d 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -109,6 +109,8 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max + build-args: | + POETRY_VERSION=${{ vars.POETRY_VERSION }} - name: Create Docker image tag Check uses: actions/github-script@v7 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3f445095..e7bee10f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,7 +22,9 @@ jobs: - uses: actions/checkout@v4 - name: "Install poetry" - run: pipx install poetry + env: + POETRY_VERSION: ${{ vars.POETRY_VERSION }} + run: pipx install "poetry==${POETRY_VERSION}" - name: "Set up Python" id: setup_python @@ -50,7 +52,9 @@ jobs: - uses: actions/checkout@v4 - name: "Install poetry" - run: pipx install poetry + env: + POETRY_VERSION: ${{ vars.POETRY_VERSION }} + run: pipx install "poetry==${POETRY_VERSION}" - name: "Set up Python" id: setup_python diff --git a/.github/workflows/follow-merge-upstream-repo-sync.yml b/.github/workflows/follow-merge-upstream-repo-sync.yml index 8ea6462d..10ec3d68 100644 --- a/.github/workflows/follow-merge-upstream-repo-sync.yml +++ b/.github/workflows/follow-merge-upstream-repo-sync.yml @@ -88,7 +88,9 @@ jobs: working_directory: "${{ env.UPSTREAM_REPO_WORKDIR }}" - name: "Install poetry" - run: pipx install poetry + env: + POETRY_VERSION: ${{ vars.POETRY_VERSION }} + run: pipx install "poetry==${POETRY_VERSION}" - name: "Set up Python" id: setup_python diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b693bfd9..14a90ce0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,7 +33,9 @@ jobs: - uses: actions/checkout@v4 - name: "Install poetry" - run: pipx install poetry + env: + POETRY_VERSION: ${{ vars.POETRY_VERSION }} + run: pipx install "poetry==${POETRY_VERSION}" - name: "Set up Python" id: setup_python @@ -65,7 +67,9 @@ jobs: - uses: actions/checkout@v4 - name: "Install poetry" - run: pipx install poetry + env: + POETRY_VERSION: ${{ vars.POETRY_VERSION }} + run: pipx install "poetry==${POETRY_VERSION}" - name: "Set up Python ${{ matrix.python-version }}" id: setup_python diff --git a/Dockerfile.app b/Dockerfile.app index 09509fa1..c761ef0a 100644 --- a/Dockerfile.app +++ b/Dockerfile.app @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG PYTHON_VERSION=3.12 -ARG POETRY_VERSION=1.8.5 +ARG POETRY_VERSION=2.0.1 ################################ Overview diff --git a/poetry.lock b/poetry.lock index fe3bb97f..7ec6922e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.0.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.0.1 and should not be changed by hand. [[package]] name = "aiohappyeyeballs" @@ -8767,4 +8767,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = ">=3.9,<3.13" -content-hash = "c410ac24d1eb5ca241e533e75ff2c37e79043bc0f0806906749bc87a0360e24e" +content-hash = "1614a8b00eb1ece85c56deb7745773592fdd979fd830c40dd8366208c6a24887" diff --git a/pyproject.toml b/pyproject.toml index 5d14c922..bd99f7d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ litellm = "^1.47.2" pandarallel = "^1.6.5" instructor = "^1.4.3" -[tool.poetry.dev-dependencies] +[tool.poetry.group.dev.dependencies] pytest = "^7.4.3" pytest-cov = "^4.1.0" black = "^24.8.0"