From 0f621a95cd0984ebcd2ffb1eecd79391920ebb50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 23:26:45 +0000 Subject: [PATCH 1/4] chore(deps-dev): bump django from 4.2.7 to 5.0 Bumps [django](https://github.com/django/django) from 4.2.7 to 5.0. - [Commits](https://github.com/django/django/compare/4.2.7...5.0) --- updated-dependencies: - dependency-name: django dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 87f6e5283..0c3a9e8ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ classifiers = ["Programming Language :: Python :: 3 :: Only"] requires-python = ">=3.9" dependencies = [ "Authlib==1.2.1", - "Django==4.2.7", + "Django==5.0", "django-csp==3.7", "eligibility-api==2023.9.1", "requests==2.31.0", From 132eb1ac73626505af541565768765f48d807c13 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 14 Dec 2023 23:56:20 +0000 Subject: [PATCH 2/4] docs: update django to 5 --- bin/build.sh | 1 + docs/README.md | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index e9af5c641..ae6555475 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -7,6 +7,7 @@ if [[ $(uname -m) == 'arm64' ]]; then # workaround for an issue in BuildKit causing dependent builds (specifically the dev image) to fail # https://github.com/docker/compose/issues/8449#issuecomment-1125761231 export DOCKER_BUILDKIT=0 + export COMPOSE_DOCKER_CLI_BUILD=0 fi docker compose build --pull client diff --git a/docs/README.md b/docs/README.md index 546679e8c..81c4da1d6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -24,7 +24,7 @@ The following California transit agencies have launched Cal-ITP Benefits for the | Transit agency | Older adults | Agency card | Veterans | Initial agency launch | | ----------------------------------------------- | ------------ | ----------- | -------- | --------------------- | -| **Monterey-Salinas Transit** | Live | Live | Live | 05/2021 | +| **Monterey-Salinas Transit** | Live | Live | Live | 05/2021 | | **Santa Barbara Metropolitan Transit District** | Live | In test |   | 10/2023 | | **Sacramento Regional Transit District** | In test |   |   |   | @@ -34,15 +34,15 @@ The Cal-ITP Benefits app supports the following enrollment pathways that use the | Enrollment pathway | Eligibility verification | Status | Launch | | -------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------ | --------------------------------------------------------------------- | -| [**Older adults**](/benefits/enrollment-pathways/older-adults) | [Login.gov IAL2](https://developers.login.gov/attributes/) | Live | [08/2022](https://github.com/cal-itp/benefits/releases/tag/2022.08.1) | +| [**Older adults**](/benefits/enrollment-pathways/older-adults) | [Login.gov IAL2](https://developers.login.gov/attributes/) | Live | [08/2022](https://github.com/cal-itp/benefits/releases/tag/2022.08.1) | | [**Agency cards**](/benefits/enrollment-pathways/agency-cards) | [Eligibility API](https://docs.calitp.org/eligibility-api/specification/) | Live | [11/2022](https://github.com/cal-itp/benefits/releases/tag/2022.11.1) | -| [**Veterans**](/benefits/enrollment-pathways/veterans) | [Veteran Confirmation API](https://developer.va.gov/explore/api/veteran-confirmation) | Live | [09/2023](https://github.com/cal-itp/benefits/releases/tag/2023.09.1) | +| [**Veterans**](/benefits/enrollment-pathways/veterans) | [Veteran Confirmation API](https://developer.va.gov/explore/api/veteran-confirmation) | Live | [09/2023](https://github.com/cal-itp/benefits/releases/tag/2023.09.1) | Read more about each [enrollment pathway](/benefits/enrollment-pathways/). ## Technical details -`benefits` is a [Django 4][django] web application. The application talks to one or more [Eligibility Verification APIs](https://docs.calitp.org/eligibility-api/specification) or authentication providers. These APIs and the application are +`benefits` is a [Django 5][django] web application. The application talks to one or more [Eligibility Verification APIs](https://docs.calitp.org/eligibility-api/specification) or authentication providers. These APIs and the application are designed for privacy and security of user information: - The API communicates with signed and encrypted JSON Web Tokens containing only the most necessary of user data for the purpose of eligibility verification From 13bcb1b8b1cf78ce29ed035be8d9433e92f455df Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 14 Dec 2023 23:57:21 +0000 Subject: [PATCH 3/4] chore: undo local change --- bin/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index ae6555475..e9af5c641 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -7,7 +7,6 @@ if [[ $(uname -m) == 'arm64' ]]; then # workaround for an issue in BuildKit causing dependent builds (specifically the dev image) to fail # https://github.com/docker/compose/issues/8449#issuecomment-1125761231 export DOCKER_BUILDKIT=0 - export COMPOSE_DOCKER_CLI_BUILD=0 fi docker compose build --pull client From 0abbf671f87835f369cac437c93ecbae256aa97b Mon Sep 17 00:00:00 2001 From: Angela Tran Date: Wed, 20 Dec 2023 23:41:47 +0000 Subject: [PATCH 4/4] chore: remove setting that Django 5.0 has removed --- benefits/settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/benefits/settings.py b/benefits/settings.py index fbd9e7e01..b73069faf 100644 --- a/benefits/settings.py +++ b/benefits/settings.py @@ -191,7 +191,6 @@ def _filter_empty(ls): LOCALE_PATHS = [os.path.join(BASE_DIR, "benefits", "locale")] USE_I18N = True -USE_L10N = True TIME_ZONE = "UTC" USE_TZ = True