From 3336dd248bb37feb6816db60a68f67c197ec0a15 Mon Sep 17 00:00:00 2001 From: V Date: Thu, 30 Jan 2025 13:44:57 -0800 Subject: [PATCH] Hard code poetry versions --- .github/workflows/build-gtfs-aggregator-scraper-image.yml | 4 ++-- .github/workflows/build-gtfs-rt-archiver-v3-image.yml | 8 ++++---- .github/workflows/build-gtfs-rt-parser-v2-image.yml | 8 ++++---- .github/workflows/build-gtfs-schedule-validator-image.yml | 8 ++++---- .github/workflows/build-jupyter-singleuser-image.yml | 4 ++-- .github/workflows/deploy-kubernetes.yml | 2 +- .github/workflows/preview-kubernetes.yml | 2 +- images/jupyter-singleuser/Dockerfile | 2 +- jobs/gtfs-aggregator-scraper/Dockerfile | 2 +- jobs/gtfs-rt-parser-v2/Dockerfile | 2 +- jobs/gtfs-schedule-validator/Dockerfile | 2 +- services/gtfs-rt-archiver-v3/Dockerfile | 2 +- warehouse/Dockerfile | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-gtfs-aggregator-scraper-image.yml b/.github/workflows/build-gtfs-aggregator-scraper-image.yml index d24dcd4c68..a6ef3d3939 100644 --- a/.github/workflows/build-gtfs-aggregator-scraper-image.yml +++ b/.github/workflows/build-gtfs-aggregator-scraper-image.yml @@ -24,8 +24,8 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v4 with: - python-version: '3.9' - - run: curl -sSL https://install.python-poetry.org | python - + python-version: '3.11' + - run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - - run: cd jobs/gtfs-aggregator-scraper && poetry install && poetry run mypy . build_push: diff --git a/.github/workflows/build-gtfs-rt-archiver-v3-image.yml b/.github/workflows/build-gtfs-rt-archiver-v3-image.yml index 35aae1306f..8263442a88 100644 --- a/.github/workflows/build-gtfs-rt-archiver-v3-image.yml +++ b/.github/workflows/build-gtfs-rt-archiver-v3-image.yml @@ -28,8 +28,8 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v4 with: - python-version: '3.9' - - run: curl -sSL https://install.python-poetry.org | python - + python-version: '3.11' + - run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - - run: cd services/gtfs-rt-archiver-v3 && poetry install && poetry run mypy . build_push: @@ -45,8 +45,8 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - uses: actions/setup-python@v4 with: - python-version: '3.10' - - run: curl -sSL https://install.python-poetry.org | python - + python-version: '3.11' + - run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - # from https://forcepush.tech/python-package-ci-cd-with-git-hub-actions - name: Get image tag from pyproject.toml and commit SHA run: | diff --git a/.github/workflows/build-gtfs-rt-parser-v2-image.yml b/.github/workflows/build-gtfs-rt-parser-v2-image.yml index d85f789e15..60dcfa8825 100644 --- a/.github/workflows/build-gtfs-rt-parser-v2-image.yml +++ b/.github/workflows/build-gtfs-rt-parser-v2-image.yml @@ -24,8 +24,8 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v4 with: - python-version: '3.9' - - run: curl -sSL https://install.python-poetry.org | python - + python-version: '3.11' + - run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - - run: cd jobs/gtfs-rt-parser-v2 && poetry install && poetry run mypy . test: @@ -39,8 +39,8 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v4 with: - python-version: '3.9' - - run: curl -sSL https://install.python-poetry.org | python - + python-version: '3.11' + - run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - - run: cd jobs/gtfs-rt-parser-v2 && poetry install && poetry run pytest build_push: diff --git a/.github/workflows/build-gtfs-schedule-validator-image.yml b/.github/workflows/build-gtfs-schedule-validator-image.yml index 9cdaefcc2b..725c2c7aa2 100644 --- a/.github/workflows/build-gtfs-schedule-validator-image.yml +++ b/.github/workflows/build-gtfs-schedule-validator-image.yml @@ -24,8 +24,8 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v4 with: - python-version: '3.9' - - run: curl -sSL https://install.python-poetry.org | python - + python-version: '3.11' + - run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - - run: cd jobs/gtfs-schedule-validator && poetry install && poetry run mypy . test: @@ -37,8 +37,8 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v4 with: - python-version: '3.9' - - run: curl -sSL https://install.python-poetry.org | python - + python-version: '3.11' + - run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - - run: cd jobs/gtfs-schedule-validator && poetry install && poetry run pytest build_push: diff --git a/.github/workflows/build-jupyter-singleuser-image.yml b/.github/workflows/build-jupyter-singleuser-image.yml index fd968ec200..0bdb6688b8 100644 --- a/.github/workflows/build-jupyter-singleuser-image.yml +++ b/.github/workflows/build-jupyter-singleuser-image.yml @@ -29,8 +29,8 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - uses: actions/setup-python@v4 with: - python-version: '3.10' - - run: curl -sSL https://install.python-poetry.org | python - + python-version: '3.11' + - run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - # from https://forcepush.tech/python-package-ci-cd-with-git-hub-actions - name: Get image tag from pyproject.toml run: | diff --git a/.github/workflows/deploy-kubernetes.yml b/.github/workflows/deploy-kubernetes.yml index 810874c9b4..3c4500ced9 100644 --- a/.github/workflows/deploy-kubernetes.yml +++ b/.github/workflows/deploy-kubernetes.yml @@ -37,7 +37,7 @@ jobs: with: cluster_name: ${{ env.GKE_NAME }} location: ${{ env.GKE_REGION }} - - run: curl -sSL https://install.python-poetry.org | python - + - run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - - name: Set up hologit env: BIO_RELEASE: 1.6.821 diff --git a/.github/workflows/preview-kubernetes.yml b/.github/workflows/preview-kubernetes.yml index b4937fdd49..3d94f19966 100644 --- a/.github/workflows/preview-kubernetes.yml +++ b/.github/workflows/preview-kubernetes.yml @@ -37,7 +37,7 @@ jobs: with: cluster_name: ${{ env.GKE_NAME }} location: ${{ env.GKE_REGION }} - - run: curl -sSL https://install.python-poetry.org | python - + - run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - - name: Set up hologit env: BIO_RELEASE: 1.6.821 diff --git a/images/jupyter-singleuser/Dockerfile b/images/jupyter-singleuser/Dockerfile index 68fe4ce652..65f5817917 100644 --- a/images/jupyter-singleuser/Dockerfile +++ b/images/jupyter-singleuser/Dockerfile @@ -26,7 +26,7 @@ RUN mkdir $POETRY_HOME \ USER $NB_UID -RUN curl -sSL https://install.python-poetry.org | python3 - +RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - ENV PATH="$POETRY_HOME/bin:$PATH" RUN npm install -g --unsafe-perm=true --allow-root netlify-cli # RUN npm install -g --unsafe-perm=true --allow-root vega-cli # Can't get these to work diff --git a/jobs/gtfs-aggregator-scraper/Dockerfile b/jobs/gtfs-aggregator-scraper/Dockerfile index 18580f5ffd..7008c2e004 100644 --- a/jobs/gtfs-aggregator-scraper/Dockerfile +++ b/jobs/gtfs-aggregator-scraper/Dockerfile @@ -2,7 +2,7 @@ FROM python:3.9 LABEL org.opencontainers.image.source https://github.com/cal-itp/data-infra -RUN curl -sSL https://install.python-poetry.org | python - +RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - ENV PATH="/root/.local/bin:${PATH}" RUN poetry self add poetry-plugin-export@1.9.0 diff --git a/jobs/gtfs-rt-parser-v2/Dockerfile b/jobs/gtfs-rt-parser-v2/Dockerfile index 96c2dcda41..53e776de54 100644 --- a/jobs/gtfs-rt-parser-v2/Dockerfile +++ b/jobs/gtfs-rt-parser-v2/Dockerfile @@ -8,7 +8,7 @@ ENV GTFS_RT_VALIDATOR_VERSION=v1.0.0 RUN apt-get update -y \ && apt-get install -y python3 python3-pip python3-venv libunwind-dev liblz4-dev -RUN curl -sSL https://install.python-poetry.org | python3 - +RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - ENV PATH="/root/.local/bin:${PATH}" RUN poetry self add poetry-plugin-export@1.9.0 # from https://github.com/MobilityData/gtfs-realtime-validator/packages/1268973 diff --git a/jobs/gtfs-schedule-validator/Dockerfile b/jobs/gtfs-schedule-validator/Dockerfile index 9cab505b5d..88164a4e3b 100644 --- a/jobs/gtfs-schedule-validator/Dockerfile +++ b/jobs/gtfs-schedule-validator/Dockerfile @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.source=https://github.com/cal-itp/data-infra RUN apt-get update -y \ && apt-get install -y python3 python3-pip python3-venv libunwind-dev liblz4-dev -RUN curl -sSL https://install.python-poetry.org | python3 - +RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - ENV PATH="/root/.local/bin:${PATH}" RUN poetry self add poetry-plugin-export@1.9.0 diff --git a/services/gtfs-rt-archiver-v3/Dockerfile b/services/gtfs-rt-archiver-v3/Dockerfile index 2f1ffd19dd..b92f4de2f0 100644 --- a/services/gtfs-rt-archiver-v3/Dockerfile +++ b/services/gtfs-rt-archiver-v3/Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.source=https://github.com/cal-itp/data-infra RUN apt-get update && apt-get install -y libunwind-dev liblz4-dev -RUN curl -sSL https://install.python-poetry.org | python3 - +RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - ENV PATH="/root/.local/bin:${PATH}" RUN poetry self add poetry-plugin-export@1.9.0 diff --git a/warehouse/Dockerfile b/warehouse/Dockerfile index 1746aa3ae0..850b552d09 100644 --- a/warehouse/Dockerfile +++ b/warehouse/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update \ RUN npm install -g --unsafe-perm=true --allow-root netlify-cli -RUN curl -sSL https://install.python-poetry.org | python3 - +RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python - ENV PATH="/root/.local/bin:${PATH}" RUN poetry self add poetry-plugin-export@1.9.0