Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trying to update our CI and lock it down at the same time #3669

Draft
wants to merge 34 commits into
base: main
Choose a base branch
from
Draft

Trying to update our CI and lock it down at the same time #3669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
407a7f2
Pollute the git space
Jan 29, 2025
264453b
Adds export command for the Dockerfile
Jan 29, 2025
527b763
push to false hub
Jan 29, 2025
9d1ca3e
more-mains-gone
Jan 29, 2025
5cbd182
Moved self add command.
Jan 29, 2025
b1b07d8
removed due to warning
Jan 29, 2025
e2ff757
Add export package to prevent future errors.
Jan 30, 2025
eed4178
updates prproject.toml files
Jan 30, 2025
bb1b921
updates
Jan 30, 2025
fc3f5dc
test-locking-down-poetry
Jan 30, 2025
3336dd2
Hard code poetry versions
Jan 30, 2025
ff9ad62
fixes
Jan 30, 2025
fe376d1
Pollute the git space
Jan 29, 2025
b0aa805
Adds export command for the Dockerfile
Jan 29, 2025
d278cd4
push to false hub
Jan 29, 2025
fd0d400
more-mains-gone
Jan 29, 2025
4e686f0
Moved self add command.
Jan 29, 2025
c646ca1
removed due to warning
Jan 29, 2025
c19a7cf
Add export package to prevent future errors.
Jan 30, 2025
a61e769
updates prproject.toml files
Jan 30, 2025
15e76e2
updates
Jan 30, 2025
9bc3e3e
test-locking-down-poetry
Jan 30, 2025
ccb45b8
Hard code poetry versions
Jan 30, 2025
6dfa645
fixes
Jan 30, 2025
8222e19
fixes
Jan 30, 2025
fc0d2f5
Merge branch 'git_action_testground' of https://github.com/cal-itp/da…
Jan 30, 2025
b568c4a
updated poetry
Jan 30, 2025
96440c3
hold python at py 3.11
Jan 30, 2025
962bc2b
updates
Jan 30, 2025
f2364e7
poetry updates
Jan 30, 2025
cb770e0
fix error
Jan 30, 2025
f50e35b
fixed
Jan 31, 2025
c8a86de
test
Jan 31, 2025
83ae54d
Merge branch 'main' into git_action_testground
vevetron Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-calitp-data-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- uses: google-github-actions/setup-gcloud@v2
- name: Run checks
run: |
curl -sSL https://install.python-poetry.org | python -
curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python -
poetry install
poetry run mypy .
poetry run pytest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-calitp-data-infra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- uses: google-github-actions/setup-gcloud@v2
- name: Run checks
run: |
curl -sSL https://install.python-poetry.org | python -
curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python -
poetry install
poetry run mypy .
poetry run pytest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-calitp-map-utils.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
python-version: '3.11'
- run: |
curl -sSL https://install.python-poetry.org | python -
curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python -
poetry install
poetry run mypy calitp_map_utils
poetry run pytest --spec
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-dask-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- run: curl -sSL https://install.python-poetry.org | python -
- 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 version.txt
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-gtfs-aggregator-scraper-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-gtfs-rt-archiver-v3-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-gtfs-rt-parser-v2-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-gtfs-schedule-validator-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-jupyter-singleuser-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-kubernetes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview-kubernetes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion images/jupyter-singleuser/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion jobs/gtfs-aggregator-scraper/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ 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

WORKDIR /app

Expand Down
Loading
Loading