Skip to content

Commit 70d4b59

Browse files
scarlsonkhvn26
andauthored
deps: bump dj-database-url from v0.5.0 to v3.0.1, add django_cockroachdb (#5789)
Co-authored-by: Kim Gustyr <[email protected]>
1 parent 126ed64 commit 70d4b59

File tree

4 files changed

+30
-14
lines changed

4 files changed

+30
-14
lines changed

api/app/settings/common.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import warnings
1717
from datetime import datetime, time, timedelta
1818

19-
import dj_database_url # type: ignore[import-untyped]
19+
import dj_database_url
2020
import django_stubs_ext
2121
import prometheus_client
2222
import pytz
@@ -168,7 +168,7 @@
168168
SITE_ID = 1
169169

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

173173
DATABASE_ROUTERS = ["app.routers.PrimaryReplicaRouter"]
174174
NUM_DB_REPLICAS = 0
@@ -261,14 +261,14 @@
261261

262262
# Task processor database — OPTIONALLY SEPARATED
263263
TASK_PROCESSOR_DATABASE_URL = env("TASK_PROCESSOR_DATABASE_URL", default=None)
264-
TASK_PROCESSOR_DATABASE_USER = env("TASK_PROCESSOR_DATABASE_USER", default=None)
264+
TASK_PROCESSOR_DATABASE_USER = env("TASK_PROCESSOR_DATABASE_USER", default="")
265265
TASK_PROCESSOR_DATABASE_PASSWORD = env(
266266
"TASK_PROCESSOR_DATABASE_PASSWORD",
267-
default=None,
267+
default="",
268268
)
269-
TASK_PROCESSOR_DATABASE_HOST = env("TASK_PROCESSOR_DATABASE_HOST", default=None)
270-
TASK_PROCESSOR_DATABASE_PORT = env("TASK_PROCESSOR_DATABASE_PORT", default=None)
271-
TASK_PROCESSOR_DATABASE_NAME = env("TASK_PROCESSOR_DATABASE_NAME", default=None)
269+
TASK_PROCESSOR_DATABASE_HOST = env("TASK_PROCESSOR_DATABASE_HOST", default="")
270+
TASK_PROCESSOR_DATABASE_PORT = env("TASK_PROCESSOR_DATABASE_PORT", default="")
271+
TASK_PROCESSOR_DATABASE_NAME = env("TASK_PROCESSOR_DATABASE_NAME", default="")
272272

273273
if TASK_PROCESSOR_DATABASE_URL or TASK_PROCESSOR_DATABASE_NAME: # pragma: no cover
274274
if TASK_PROCESSOR_DATABASE_URL:

api/poetry.lock

Lines changed: 19 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ pyparsing = "~2.4.7"
112112
requests = "~2.32.4"
113113
six = "~1.16.0"
114114
whitenoise = "~6.0.0"
115-
dj-database-url = "~0.5.0"
115+
dj-database-url = "~3.0.1"
116116
drf-nested-routers = "~0.92.1"
117117
shortuuid = "~1.0.1"
118118
sendgrid-django = "~4.2.0"
@@ -166,6 +166,7 @@ tzdata = "^2024.1"
166166
djangorestframework-simplejwt = "^5.3.1"
167167
structlog = "^24.4.0"
168168
prometheus-client = "^0.21.1"
169+
django_cockroachdb = "~4.2"
169170

170171
[tool.poetry.group.auth-controller]
171172
optional = true

docs/docs/deployment/hosting/kubernetes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,8 @@ The following table lists the configurable parameters of the chart and their def
385385
| `postgresqlUsername` | | `postgres` |
386386
| `postgresqlPassword` | | `flagsmith` |
387387
| `databaseExternal.enabled` | use an external database. Specify database URL, or all parts. | `false` |
388-
| `databaseExternal.url` | See [schema](https://github.com/kennethreitz/dj-database-url#url-schema). | |
389-
| `databaseExternal.type` | Note: Only postgres supported by default images. | `postgres` |
388+
| `databaseExternal.url` | See [schema](https://github.com/jazzband/dj-database-url#url-schema). | |
389+
| `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` |
390390
| `databaseExternal.port` | | 5432 |
391391
| `databaseExternal.database` | Name of the database within the server | |
392392
| `databaseExternal.username` | | |

0 commit comments

Comments
 (0)