Skip to content

deps: bump dj-database-url from v0.5.0 to v3.0.1, add django_cockroachdb #5789

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

Merged
khvn26 merged 3 commits into from
Jul 23, 2025
Merged

deps: bump dj-database-url from v0.5.0 to v3.0.1, add django_cockroachdb #5789

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
eea29b5
deps(api): update dj-database-url dependency, add django_cockroachdb …
scarlson Jul 21, 2025
bc4539c
docs(hosting-k8s): update note for databaseExternal.type to indicate …
scarlson Jul 21, 2025
cf8f3dd
Merge branch 'main' into support-cockroachdb
khvn26 Jul 23, 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
14 changes: 7 additions & 7 deletions api/app/settings/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import warnings
from datetime import datetime, time, timedelta

import dj_database_url # type: ignore[import-untyped]
import dj_database_url
import django_stubs_ext
import prometheus_client
import pytz
Expand Down Expand Up @@ -168,7 +168,7 @@
SITE_ID = 1

db_conn_max_age = env.int("DJANGO_DB_CONN_MAX_AGE", 60)
DJANGO_DB_CONN_MAX_AGE = None if db_conn_max_age == -1 else db_conn_max_age
DJANGO_DB_CONN_MAX_AGE = 0 if db_conn_max_age == -1 else db_conn_max_age

DATABASE_ROUTERS = ["app.routers.PrimaryReplicaRouter"]
NUM_DB_REPLICAS = 0
Expand Down Expand Up @@ -261,14 +261,14 @@

# Task processor database — OPTIONALLY SEPARATED
TASK_PROCESSOR_DATABASE_URL = env("TASK_PROCESSOR_DATABASE_URL", default=None)
TASK_PROCESSOR_DATABASE_USER = env("TASK_PROCESSOR_DATABASE_USER", default=None)
TASK_PROCESSOR_DATABASE_USER = env("TASK_PROCESSOR_DATABASE_USER", default="")
TASK_PROCESSOR_DATABASE_PASSWORD = env(
"TASK_PROCESSOR_DATABASE_PASSWORD",
default=None,
default="",
)
TASK_PROCESSOR_DATABASE_HOST = env("TASK_PROCESSOR_DATABASE_HOST", default=None)
TASK_PROCESSOR_DATABASE_PORT = env("TASK_PROCESSOR_DATABASE_PORT", default=None)
TASK_PROCESSOR_DATABASE_NAME = env("TASK_PROCESSOR_DATABASE_NAME", default=None)
TASK_PROCESSOR_DATABASE_HOST = env("TASK_PROCESSOR_DATABASE_HOST", default="")
TASK_PROCESSOR_DATABASE_PORT = env("TASK_PROCESSOR_DATABASE_PORT", default="")
TASK_PROCESSOR_DATABASE_NAME = env("TASK_PROCESSOR_DATABASE_NAME", default="")

if TASK_PROCESSOR_DATABASE_URL or TASK_PROCESSOR_DATABASE_NAME: # pragma: no cover
if TASK_PROCESSOR_DATABASE_URL:
Expand Down
23 changes: 19 additions & 4 deletions api/poetry.lock
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion api/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ pyparsing = "~2.4.7"
requests = "~2.32.4"
six = "~1.16.0"
whitenoise = "~6.0.0"
dj-database-url = "~0.5.0"
dj-database-url = "~3.0.1"
drf-nested-routers = "~0.92.1"
shortuuid = "~1.0.1"
sendgrid-django = "~4.2.0"
Expand Down Expand Up @@ -166,6 +166,7 @@ tzdata = "^2024.1"
djangorestframework-simplejwt = "^5.3.1"
structlog = "^24.4.0"
prometheus-client = "^0.21.1"
django_cockroachdb = "~4.2"

[tool.poetry.group.auth-controller]
optional = true
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/deployment/hosting/kubernetes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ The following table lists the configurable parameters of the chart and their def
| `postgresqlUsername` | | `postgres` |
| `postgresqlPassword` | | `flagsmith` |
| `databaseExternal.enabled` | use an external database. Specify database URL, or all parts. | `false` |
| `databaseExternal.url` | See [schema](https://github.com/kennethreitz/dj-database-url#url-schema). | |
| `databaseExternal.type` | Note: Only postgres supported by default images. | `postgres` |
| `databaseExternal.url` | See [schema](https://github.com/jazzband/dj-database-url#url-schema). | |
| `databaseExternal.type` | Note: Only Postgres is fully supported by default images. [Other databases](https://github.com/jazzband/dj-database-url#supported-databases) not guaranteed to work. | `postgres` |
| `databaseExternal.port` | | 5432 |
| `databaseExternal.database` | Name of the database within the server | |
| `databaseExternal.username` | | |
Expand Down
Loading