Merge pull request #627 from jbernal0019/master

Add DATABASE_CONN_POOL env variables and upgrade all python libraries

Author: jbernal0019

chris_backend/config/settings/common.py

@@ -119,9 +119,6 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
-        'OPTIONS': {
-            'pool': True  # use defaults
-        }
     }
 }
 

chris_backend/config/settings/local.py

@@ -124,6 +124,7 @@
 DATABASES['default']['TEST'] = {'NAME': 'test_chris_dev'}
 DATABASES['default']['HOST'] = 'chris_dev_db'
 DATABASES['default']['PORT'] = '5432'
+DATABASES['default']['OPTIONS'] = {'pool': {'min_size': 1, 'max_size': 2, 'timeout': 10}}
 
 # Mail settings
 # ------------------------------------------------------------------------------

chris_backend/config/settings/production.py

@@ -54,6 +54,14 @@ def get_secret(setting, secret_type=env):
 DATABASES['default']['PASSWORD'] = get_secret('POSTGRES_PASSWORD')
 DATABASES['default']['HOST'] = get_secret('DATABASE_HOST')
 DATABASES['default']['PORT'] = get_secret('DATABASE_PORT')
+DATABASE_CONN_POOL = get_secret('DATABASE_CONN_POOL', env.bool)
+if DATABASE_CONN_POOL:
+    DATABASE_CONN_POOL_MIN_SIZE = get_secret('DATABASE_CONN_POOL_MIN_SIZE', env.int)
+    DATABASE_CONN_POOL_MAX_SIZE = get_secret('DATABASE_CONN_POOL_MAX_SIZE', env.int)
+    DATABASE_CONN_POOL_TIMEOUT = get_secret('DATABASE_CONN_POOL_TIMEOUT', env.float)
+    DATABASES['default']['OPTIONS'] = {'pool': {'min_size': DATABASE_CONN_POOL_MIN_SIZE,
+                                                'max_size': DATABASE_CONN_POOL_MAX_SIZE,
+                                                'timeout': DATABASE_CONN_POOL_TIMEOUT}}
 
 
 # STORAGE CONFIGURATION

requirements/base.txt

@@ -1,20 +1,20 @@
-Django==5.1.7
+Django==5.2.1
 django-filter==25.1
-djangorestframework==3.15.2
+djangorestframework==3.16.0
 django-cors-headers==4.7.0
 psycopg[binary,pool]
 environs==14.1.1
 python-swiftclient==4.7.0
 django-storage-swift==1.4.0
-celery==5.4.0
-django-celery-beat==2.7.0
+celery==5.5.2
+django-celery-beat==2.8.1
 python-chrisstoreclient==1.0.0
 python-pfconclient==3.2.0
-django-auth-ldap==5.1.0
+django-auth-ldap==5.2.0
 PyYAML==6.0.2
-whitenoise[brotli]==6.5.0
+whitenoise[brotli]==6.9.0
 PyJWT===2.10.1
-channels==4.2.0
-nats-py==2.9.0
-granian==1.6.1
+channels==4.2.2
+nats-py==2.10.0
+granian==2.2.6
 git+https://github.com/tfranzel/drf-spectacular.git@refs/pull/1307/head

requirements/local.txt

@@ -1,13 +1,13 @@
 # Local development dependencies go here
 -r base.txt
-django-debug-toolbar==5.0.1
-django-extensions==3.2.3
+django-debug-toolbar==5.2.0
+django-extensions==4.1
 collection-json==0.1.1
-coverage==7.6.12
-pylint==3.3.4
-flake8==7.1.2
+coverage==7.8.0
+pylint==3.3.7
+flake8==7.2.0
 isort==6.0.1
-pudb==2024.1.3
+pudb==2025.1
 daphne==4.1.2  # required by (django) channels.testing
 granian[reload]
 https://github.com/msbrogli/rpudb/archive/master.zip