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

Jump to bottom

[Issue #2184] Tidy up python and docker usage in analytics #2185

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[Issue #2184] Tidy up python and docker usage in analytics #2185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1521986
[Issue #2184] Tidy up python and docker usage in analytics
chouinar Sep 19, 2024
266d35c
Upgrade python in the ci as well
chouinar Sep 19, 2024
07a4348
Update the poetry.lock
chouinar Sep 19, 2024
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/ci-analytics.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.12"

# install poetry
- uses: Gr1N/setup-poetry@v8
Expand Down
2 changes: 1 addition & 1 deletion analytics/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# The build stage that will be used to deploy to the various environments
# needs to be called `release` in order to integrate with the repo's
# top-level Makefile
FROM python:3-slim AS base
FROM python:3.12-slim AS base

# Install poetry, the package manager.
# https://python-poetry.org
Expand Down
2 changes: 1 addition & 1 deletion analytics/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ login:
$(GITHUB) auth login

build:
docker-compose build
docker compose build

release-build:
docker buildx build \
Expand Down
2 changes: 0 additions & 2 deletions analytics/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:

grants-analytics-db:
Expand Down
31 changes: 5 additions & 26 deletions analytics/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions analytics/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pandas = "^2.0.3"
pandas-stubs = "^2.0.2.230605"
plotly = "^5.15.0"
pydantic = "^2.0.3"
python = "^3.11"
python = "~3.12"
slack-sdk = "^3.23.0"
typer = { extras = ["all"], version = "^0.9.0" }
sqlalchemy = "^2.0.30"
Expand All @@ -38,7 +38,7 @@ build-backend = "poetry.core.masonry.api"
requires = ["poetry-core"]

[tool.mypy]
python_version = "3.11"
python_version = "3.12"

[[tool.mypy.overrides]]
ignore_missing_imports = true
Expand Down
Loading