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.

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

⬆️(project) upgrade python dependencies #294

Merged
merged 4 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .github/workflows/api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ jobs:
QUALICHARGE_DB_ENGINE: postgresql+psycopg
QUALICHARGE_DB_HOST: localhost
QUALICHARGE_DB_NAME: qualicharge-api
QUALICHARGE_DB_PASSWORD: pass
QUALICHARGE_DB_USER: qualicharge
QUALICHARGE_TEST_DB_NAME: test-qualicharge-api
QUALICHARGE_OIDC_IS_ENABLED: False
QUALICHARGE_ALLOWED_HOSTS: '["http://localhost:8000"]'
Expand Down Expand Up @@ -316,9 +318,12 @@ jobs:
- name: Run migrations
run: pipenv run alembic -c qualicharge/alembic.ini upgrade head
env:
QUALICHARGE_ALLOWED_HOSTS: '["http://localhost:8000"]'
QUALICHARGE_DB_ENGINE: postgresql+psycopg
QUALICHARGE_DB_HOST: localhost
QUALICHARGE_DB_NAME: test-qualicharge-api
QUALICHARGE_DB_PASSWORD: pass
QUALICHARGE_DB_USER: qualicharge
QUALICHARGE_TEST_DB_NAME: test-qualicharge-api
# This is a fake setting required to run the app
QUALICHARGE_OIDC_PROVIDER_BASE_URL: http://localhost:8080/fake
Expand Down Expand Up @@ -361,9 +366,12 @@ jobs:
- name: Test with pytest
run: pipenv run pytest
env:
QUALICHARGE_ALLOWED_HOSTS: '["http://localhost:8000"]'
QUALICHARGE_DB_ENGINE: postgresql+psycopg
QUALICHARGE_DB_HOST: localhost
QUALICHARGE_DB_NAME: test-qualicharge-api
QUALICHARGE_DB_PASSWORD: pass
QUALICHARGE_DB_USER: qualicharge
QUALICHARGE_TEST_DB_NAME: test-qualicharge-api
QUALICHARGE_API_GET_USER_CACHE_INFO: true
QUALICHARGE_API_GET_PDC_ID_CACHE_INFO: true
Expand Down
4 changes: 4 additions & 0 deletions src/api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ and this project adheres to
command
- Decrease the number of database queries for dynamic endpoints
- Cache the "get PointDeCharge id from its `id_pdc_itinerance`" database query
- Upgrade pydantic to `2.10.4`
- Upgrade pydantic-settings to `2.7.1`
- Upgrade python-multipart to `0.0.20`
- Upgrade questionary to `2.1.0`

## [0.16.0] - 2024-12-12

Expand Down
18 changes: 9 additions & 9 deletions src/api/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ pandas = "==2.2.3"
passlib = {extras = ["bcrypt"], version = "==1.7.4"}
psycopg = {extras = ["pool", "binary"], version = "==3.2.3"}
pyarrow = "==18.1.0"
pydantic = "==2.10.3"
pydantic = "==2.10.4"
pydantic-extra-types = {extras = ["all"], version = "==2.10.1"}
pydantic-settings = "==2.6.1"
pydantic-settings = "==2.7.1"
pyinstrument = "==5.0.0"
pyjwt = "==2.10.1"
python-multipart = "==0.0.19"
questionary = "==2.0.1"
python-multipart = "==0.0.20"
questionary = "==2.1.0"
sentry-sdk = {extras = ["fastapi"], version = "==2.19.2"}
setuptools = "==75.6.0"
setuptools = "==75.7.0"
sqlalchemy-timescaledb = "==0.4.1"
sqlmodel = "==0.0.22"
typer = "==0.15.1"
Expand All @@ -34,17 +34,17 @@ uvicorn = {extras = ["standard"] }
black = "==24.10.0"
csvkit = "==2.0.1"
honcho = "==2.0.0"
locust = "==2.32.4"
mypy = "==1.13.0"
locust = "==2.32.5"
mypy = "==1.14.1"
pandas-stubs = "==2.2.3.241126"
polyfactory = "==2.18.1"
pytest = "==8.3.4"
pytest-cov = "==6.0.0"
pytest-httpx = "==0.35.0"
qualicharge = {path = ".", editable = true}
ruff = "==0.8.2"
ruff = "==0.8.6"
types-cachetools = "==5.5.0.20240820"
types-passlib = "==1.7.7.20240819"
types-passlib = "==1.7.7.20241221"
types-python-jose = "==3.3.4.20240106"
types-requests = "==2.32.0.20241016"

Expand Down
1,021 changes: 507 additions & 514 deletions src/api/Pipfile.lock

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions src/api/qualicharge/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ class Settings(BaseSettings):
DEBUG: bool = False

# Security
ALLOWED_HOSTS: List[str] = [
"http://localhost:8010",
]
ALLOWED_HOSTS: List[str]

# Middlewares
GZIP_MIDDLEWARE_MINIMUM_SIZE: int = 1000
Expand All @@ -35,10 +33,10 @@ class Settings(BaseSettings):

# Database
DB_ENGINE: str = "postgresql"
DB_HOST: str = "postgresql"
DB_NAME: str = "qualicharge-api"
DB_USER: str = "qualicharge"
DB_PASSWORD: str = "pass"
DB_HOST: str
DB_NAME: str
DB_USER: str
DB_PASSWORD: str
DB_PORT: int = 5432
DB_CONNECTION_POOL_SIZE: int = 5
DB_CONNECTION_MAX_OVERFLOW: int = 10
Expand Down Expand Up @@ -85,7 +83,7 @@ def TEST_DATABASE_URL(self) -> PostgresDsn:
OAUTH2_TOKEN_ENCODING_KEY: str
OAUTH2_TOKEN_ISSUER: AnyHttpUrl
OAUTH2_TOKEN_LIFETIME: int = 30 * 60 # in seconds
OAUTH2_TOKEN_URL: str = "/api/v1/auth/token"
OAUTH2_TOKEN_URL: str = "/api/v1/auth/token" # noqa: S105

@computed_field # type: ignore[misc]
@property
Expand Down
338 changes: 172 additions & 166 deletions src/client/poetry.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/dashboard/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name = "pypi"

[packages]
Django = "==5.1.4"
django-dsfr = "==1.4.3"
django-dsfr = "==1.4.5"
django-environ = "==0.11.2"
django-extensions = "==3.2.3"
django-stubs = {extras = ["compatible-mypy"], version = "==5.1.1"}
Expand All @@ -17,15 +17,15 @@ whitenoise = "==6.8.2"
[dev-packages]
black = "==24.10.0"
django-debug-toolbar = "==4.4.6"
djlint = "==1.36.3"
djlint = "==1.36.4"
factory-boy = "==3.3.1"
honcho = "==2.0.0"
mypy = "==1.13.0"
mypy = "==1.14.1"
pytest = "==8.3.4"
pytest-cov = "==6.0.0"
pytest-django = "==4.9.0"
pytest-httpx = "==0.35.0"
ruff = "==0.8.2"
ruff = "==0.8.6"

[requires]
python_version = "3.12"
Loading
Loading