Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Manuel Raynaud
|
441ad03988 |
@@ -143,6 +143,7 @@ jobs:
|
||||
AWS_S3_ENDPOINT_URL: http://localhost:9000
|
||||
AWS_S3_ACCESS_KEY_ID: impress
|
||||
AWS_S3_SECRET_ACCESS_KEY: password
|
||||
DB_PSYCOPG_POOL_MAX_SIZE: 15
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
|
||||
+1
-12
@@ -6,16 +6,6 @@ and this project adheres to
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [v4.8.1] - 2026-03-17
|
||||
|
||||
### Added
|
||||
|
||||
- 🔧(backend) add DB_PSYCOPG_POOL_ENABLED settings #2035
|
||||
|
||||
### Changed
|
||||
|
||||
- ⬇️(backend) downgrade django-treebeard to version < 5.0.0 #2036
|
||||
|
||||
## [v4.8.0] - 2026-03-13
|
||||
|
||||
### Added
|
||||
@@ -1115,8 +1105,7 @@ and this project adheres to
|
||||
- ✨(frontend) Coming Soon page (#67)
|
||||
- 🚀 Impress, project to manage your documents easily and collaboratively.
|
||||
|
||||
[unreleased]: https://github.com/suitenumerique/docs/compare/v4.8.1...main
|
||||
[v4.8.1]: https://github.com/suitenumerique/docs/releases/v4.8.1
|
||||
[unreleased]: https://github.com/suitenumerique/docs/compare/v4.8.0...main
|
||||
[v4.8.0]: https://github.com/suitenumerique/docs/releases/v4.8.0
|
||||
[v4.7.0]: https://github.com/suitenumerique/docs/releases/v4.7.0
|
||||
[v4.6.0]: https://github.com/suitenumerique/docs/releases/v4.6.0
|
||||
|
||||
@@ -46,7 +46,6 @@ These are the environment variables you can set for the `impress-backend` contai
|
||||
| DB_NAME | Name of the database | impress |
|
||||
| DB_PASSWORD | Password to authenticate with | pass |
|
||||
| DB_PORT | Port of the database | 5432 |
|
||||
| DB_PSYCOPG_POOL_ENABLED | Enable or not the psycopg pool configuration in the default database options | False |
|
||||
| DB_PSYCOPG_POOL_MIN_SIZE | The psycopg min pool size | 4 |
|
||||
| DB_PSYCOPG_POOL_MAX_SIZE | The psycopg max pool size | None |
|
||||
| DB_PSYCOPG_POOL_TIMEOUT | The default maximum time in seconds that a client can wait to receive a connection from the pool | 3 |
|
||||
|
||||
@@ -9,3 +9,4 @@ DB_NAME=impress
|
||||
DB_USER=dinum
|
||||
DB_PASSWORD=pass
|
||||
DB_PORT=5432
|
||||
DB_PSYCOPG_POOL_MAX_SIZE=15
|
||||
|
||||
@@ -49,12 +49,6 @@
|
||||
"matchPackageNames": ["langfuse"],
|
||||
"allowedVersions": "<3.12.0"
|
||||
},
|
||||
{
|
||||
"groupName": "allowed django-treebeard versions",
|
||||
"matchManagers": ["pep621"],
|
||||
"matchPackageNames": ["django-treebeard"],
|
||||
"allowedVersions": "<5.0.0"
|
||||
},
|
||||
{
|
||||
"enabled": false,
|
||||
"groupName": "ignored js dependencies",
|
||||
|
||||
@@ -22,7 +22,7 @@ def set_path_on_existing_documents(apps, schema_editor):
|
||||
|
||||
# Iterate over all existing documents and make them root nodes
|
||||
documents = Document.objects.order_by("created_at").values_list("id", flat=True)
|
||||
numconv = NumConv(len(ALPHABET), ALPHABET)
|
||||
numconv = NumConv(ALPHABET)
|
||||
|
||||
updates = []
|
||||
for i, pk in enumerate(documents):
|
||||
|
||||
@@ -28,39 +28,3 @@ def test_invalid_settings_oidc_email_configuration():
|
||||
"Both OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION and "
|
||||
"OIDC_ALLOW_DUPLICATE_EMAILS cannot be set to True simultaneously. "
|
||||
)
|
||||
|
||||
|
||||
def test_settings_psycopg_pool_not_enabled():
|
||||
"""
|
||||
Test that not changing DB_PSYCOPG_POOL_ENABLED should not configure psycopg in the DATABASES
|
||||
settings.
|
||||
"""
|
||||
|
||||
class TestSettings(Base):
|
||||
"""Fake test settings without enabling psycopg"""
|
||||
|
||||
TestSettings.post_setup()
|
||||
|
||||
assert TestSettings.DATABASES["default"].get("OPTIONS") == {}
|
||||
|
||||
|
||||
def test_settings_psycopg_pool_enabled(monkeypatch):
|
||||
"""
|
||||
Test when DB_PSYCOPG_POOL_ENABLED is set to True, the psycopg pool options should be present
|
||||
in the DATABASES OPTIONS.
|
||||
"""
|
||||
|
||||
monkeypatch.setenv("DB_PSYCOPG_POOL_ENABLED", "True")
|
||||
|
||||
class TestSettings(Base):
|
||||
"""Fake test settings without enabling psycopg"""
|
||||
|
||||
TestSettings.post_setup()
|
||||
|
||||
assert TestSettings.DATABASES["default"].get("OPTIONS") == {
|
||||
"pool": {
|
||||
"min_size": 4,
|
||||
"max_size": None,
|
||||
"timeout": 3,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -99,7 +99,24 @@ class Base(Configuration):
|
||||
"localhost", environ_name="DB_HOST", environ_prefix=None
|
||||
),
|
||||
"PORT": values.Value(5432, environ_name="DB_PORT", environ_prefix=None),
|
||||
# Psycopg pool can be configured in the post_setup method
|
||||
"OPTIONS": {
|
||||
# https://www.psycopg.org/psycopg3/docs/api/pool.html#psycopg_pool.ConnectionPool
|
||||
"pool": {
|
||||
"min_size": values.IntegerValue(
|
||||
4, environ_name="DB_PSYCOPG_POOL_MIN_SIZE", environ_prefix=None
|
||||
),
|
||||
"max_size": values.IntegerValue(
|
||||
None,
|
||||
environ_name="DB_PSYCOPG_POOL_MAX_SIZE",
|
||||
environ_prefix=None,
|
||||
),
|
||||
"timeout": values.IntegerValue(
|
||||
3,
|
||||
environ_name="DB_PSYCOPG_POOL_TIMEOUT",
|
||||
environ_prefix=None,
|
||||
),
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
|
||||
@@ -1000,36 +1017,6 @@ class Base(Configuration):
|
||||
"OIDC_ALLOW_DUPLICATE_EMAILS cannot be set to True simultaneously. "
|
||||
)
|
||||
|
||||
psycopg_pool_enabled = values.BooleanValue(
|
||||
False, environ_name="DB_PSYCOPG_POOL_ENABLED", environ_prefix=""
|
||||
)
|
||||
|
||||
if psycopg_pool_enabled:
|
||||
cls.DATABASES["default"].update(
|
||||
{
|
||||
"OPTIONS": {
|
||||
# https://www.psycopg.org/psycopg3/docs/api/pool.html#psycopg_pool.ConnectionPool
|
||||
"pool": {
|
||||
"min_size": values.IntegerValue(
|
||||
4,
|
||||
environ_name="DB_PSYCOPG_POOL_MIN_SIZE",
|
||||
environ_prefix=None,
|
||||
),
|
||||
"max_size": values.IntegerValue(
|
||||
None,
|
||||
environ_name="DB_PSYCOPG_POOL_MAX_SIZE",
|
||||
environ_prefix=None,
|
||||
),
|
||||
"timeout": values.IntegerValue(
|
||||
3,
|
||||
environ_name="DB_PSYCOPG_POOL_TIMEOUT",
|
||||
environ_prefix=None,
|
||||
),
|
||||
}
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
class Build(Base):
|
||||
"""Settings used when the application is built.
|
||||
|
||||
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "impress"
|
||||
version = "4.8.1"
|
||||
version = "4.8.0"
|
||||
authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }]
|
||||
classifiers = [
|
||||
"Development Status :: 5 - Production/Stable",
|
||||
@@ -40,7 +40,7 @@ dependencies = [
|
||||
"django-storages[s3]==1.14.6",
|
||||
"django-timezone-field>=5.1",
|
||||
"django<6.0.0",
|
||||
"django-treebeard<5.0.0",
|
||||
"django-treebeard==5.0.5",
|
||||
"djangorestframework==3.16.1",
|
||||
"drf_spectacular==0.29.0",
|
||||
"dockerflow==2026.1.26",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "app-e2e",
|
||||
"version": "4.8.1",
|
||||
"version": "4.8.0",
|
||||
"repository": "https://github.com/suitenumerique/docs",
|
||||
"author": "DINUM",
|
||||
"license": "MIT",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "app-impress",
|
||||
"version": "4.8.1",
|
||||
"version": "4.8.0",
|
||||
"repository": "https://github.com/suitenumerique/docs",
|
||||
"author": "DINUM",
|
||||
"license": "MIT",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "impress",
|
||||
"version": "4.8.1",
|
||||
"version": "4.8.0",
|
||||
"private": true,
|
||||
"repository": "https://github.com/suitenumerique/docs",
|
||||
"author": "DINUM",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "eslint-plugin-docs",
|
||||
"version": "4.8.1",
|
||||
"version": "4.8.0",
|
||||
"repository": "https://github.com/suitenumerique/docs",
|
||||
"author": "DINUM",
|
||||
"license": "MIT",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "packages-i18n",
|
||||
"version": "4.8.1",
|
||||
"version": "4.8.0",
|
||||
"repository": "https://github.com/suitenumerique/docs",
|
||||
"author": "DINUM",
|
||||
"license": "MIT",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "server-y-provider",
|
||||
"version": "4.8.1",
|
||||
"version": "4.8.0",
|
||||
"description": "Y.js provider for docs",
|
||||
"repository": "https://github.com/suitenumerique/docs",
|
||||
"license": "MIT",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
apiVersion: v2
|
||||
type: application
|
||||
name: docs
|
||||
version: 4.8.1
|
||||
version: 4.8.0-psycopgpool
|
||||
appVersion: latest
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "mail_mjml",
|
||||
"version": "4.8.1",
|
||||
"version": "4.8.0",
|
||||
"description": "An util to generate html and text django's templates from mjml templates",
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
|
||||
Reference in New Issue
Block a user