From 387f2306be020138d1a6f354992676df6ca5a71b Mon Sep 17 00:00:00 2001 From: Brendon Smith Date: Mon, 11 Oct 2021 20:04:07 -0400 Subject: [PATCH] Update to Poetry 1.2 and install-poetry.py Poetry has a new install-poetry.py install script. This commit will update Poetry installs to use install-poetry.py. The install-poetry.py script is not currently in the Poetry 1.1 source tree, so Poetry will be updated to 1.2. --- .github/workflows/builds.yml | 8 ++++---- .github/workflows/hooks.yml | 8 ++++---- .github/workflows/tests.yml | 8 ++++---- Dockerfile | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index c98926a..3101b50 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -10,7 +10,7 @@ on: env: POETRY_HOME: /opt/poetry - POETRY_VERSION: 1.1.11 + POETRY_VERSION: 1.2.0a2 POETRY_VIRTUALENVS_CREATE: false jobs: @@ -40,9 +40,9 @@ jobs: restore-keys: ${{ runner.os }}-pre-commit- - name: Install Poetry run: | - curl -fsS -o get-poetry.py \ - "https://raw.githubusercontent.com/python-poetry/poetry/$POETRY_VERSION/get-poetry.py" - python get-poetry.py -y + curl -fsS -o install-poetry.py \ + "https://raw.githubusercontent.com/python-poetry/poetry/$POETRY_VERSION/install-poetry.py" + python install-poetry.py -y echo "$POETRY_HOME/bin" >> $GITHUB_PATH - name: Test Poetry version run: | diff --git a/.github/workflows/hooks.yml b/.github/workflows/hooks.yml index 85894af..dbcd368 100644 --- a/.github/workflows/hooks.yml +++ b/.github/workflows/hooks.yml @@ -8,7 +8,7 @@ on: env: POETRY_HOME: /opt/poetry - POETRY_VERSION: 1.1.11 + POETRY_VERSION: 1.2.0a2 POETRY_VIRTUALENVS_CREATE: false jobs: @@ -38,9 +38,9 @@ jobs: restore-keys: ${{ runner.os }}-pre-commit- - name: Install Poetry run: | - curl -fsS -o get-poetry.py \ - "https://raw.githubusercontent.com/python-poetry/poetry/$POETRY_VERSION/get-poetry.py" - python get-poetry.py -y + curl -fsS -o install-poetry.py \ + "https://raw.githubusercontent.com/python-poetry/poetry/$POETRY_VERSION/install-poetry.py" + python install-poetry.py -y echo "$POETRY_HOME/bin" >> $GITHUB_PATH - name: Test Poetry version run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b10cdb6..7eb49b7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ on: env: POETRY_HOME: /opt/poetry - POETRY_VERSION: 1.1.11 + POETRY_VERSION: 1.2.0a2 POETRY_VIRTUALENVS_CREATE: false jobs: @@ -35,9 +35,9 @@ jobs: restore-keys: ${{ runner.os }}-poetry- - name: Install Poetry run: | - curl -fsS -o get-poetry.py \ - "https://raw.githubusercontent.com/python-poetry/poetry/$POETRY_VERSION/get-poetry.py" - python get-poetry.py -y + curl -fsS -o install-poetry.py \ + "https://raw.githubusercontent.com/python-poetry/poetry/$POETRY_VERSION/install-poetry.py" + python install-poetry.py -y echo "$POETRY_HOME/bin" >> $GITHUB_PATH - name: Test Poetry version run: | diff --git a/Dockerfile b/Dockerfile index 070c97f..3c46302 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,9 +11,9 @@ ENV APP_MODULE=inboard.app.main_base:app LINUX_VERSION=$LINUX_VERSION PATH=/opt/ COPY poetry.lock pyproject.toml /app/ WORKDIR /app/ RUN sh -c 'if [ "$LINUX_VERSION" = "slim" ]; then apt-get update -qy && apt-get install -qy --no-install-recommends gcc libc-dev make wget; fi' && \ - wget -qO get-poetry.py "https://raw.githubusercontent.com/python-poetry/poetry/$POETRY_VERSION/get-poetry.py" && \ + wget -qO install-poetry.py "https://raw.githubusercontent.com/python-poetry/poetry/$POETRY_VERSION/install-poetry.py" && \ sh -c '. /etc/os-release; if [ "$ID" = "alpine" ]; then apk add --no-cache --virtual .build-deps gcc libc-dev make; fi' && \ - python get-poetry.py -y && poetry install --no-dev --no-interaction --no-root && \ + python install-poetry.py -y && poetry install --no-dev --no-interaction --no-root && \ sh -c 'if [ "$LINUX_VERSION" = "slim" ]; then apt-get purge --auto-remove -qy gcc libc-dev make wget; fi' && \ sh -c '. /etc/os-release; if [ "$ID" = "alpine" ]; then apk del .build-deps; fi' COPY inboard /app/inboard