Upgrade Django to 4.2.5 and postgres:16

FNNDSC · Sep 20, 2023 · fd81ad0 · fd81ad0
1 parent 5ffacfd
commit fd81ad0
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 52 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -30,7 +30,7 @@
 # docker build --build-arg http_proxy=${PROXY} --build-arg ENVIRONMENT=local -t local/chris_store:dev .
 #
 
-FROM fnndsc/ubuntu-python3:ubuntu20.04-python3.8.5
+FROM fnndsc/ubuntu-python3:ubuntu20.04-python3.8.10
 MAINTAINER fnndsc "dev@babymri.org"
 
 # Pass a UID on build command line (see above) to set internal UID

diff --git a/docker-compose_dev.yml b/docker-compose_dev.yml
@@ -34,7 +34,7 @@ services:
       role: "Development server"
 
   chris_store_dev_db:
-    image: postgres:13
+    image: postgres:16
     volumes:
       - chris_store_dev_db_data:/var/lib/postgresql/data
     environment:

diff --git a/make.sh b/make.sh
@@ -42,8 +42,8 @@ if [[ "$1" == 'up' ]]; then
 
     title -d 1 "Pulling core containers where needed..."
         printf "${LightCyan}%40s${Green}%-40s${Yellow}\n"                   \
-                "docker pull" " postgres:13"                                | ./boxes.sh
-        docker pull postgres:13                                             | ./boxes.sh
+                "docker pull" " postgres:16"                                | ./boxes.sh
+        docker pull postgres:16                                             | ./boxes.sh
         echo ""                                                             | ./boxes.sh
     windowBottom
 

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,8 +1,8 @@
-Django==4.0
-django-filter==22.1
-djangorestframework==3.13.1
-django-cors-headers==3.13.0
-psycopg2==2.9.3
-mod-wsgi==4.9.3
+Django==4.2.5
+django-filter==23.3
+djangorestframework==3.14.0
+django-cors-headers==4.2.0
+psycopg[binary,pool]
+mod-wsgi==4.9.4
 environs==9.5.0
 six==1.16.0
diff --git a/requirements/local.txt b/requirements/local.txt
@@ -1,9 +1,9 @@
 # Local development dependencies go here
 -r base.txt
-django-debug-toolbar==3.6.0
-django-extensions==3.2.0
+django-debug-toolbar==4.2.0
+django-extensions==3.2.3
 collection-json==0.1.1
-coverage==6.4.4
-pylint==2.15.0
-flake8==5.0.4
-isort==5.10.1
+coverage==7.3.1
+pylint==2.17.5
+flake8==6.1.0
+isort==5.12.0
diff --git a/store_backend/config/asgi.py b/store_backend/config/asgi.py
@@ -1,10 +1,10 @@
 """
-ASGI config for mysite project.
+ASGI config for store_backend project.
 
 It exposes the ASGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/
+https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/
 """
 
 import os, sys

diff --git a/store_backend/config/settings/common.py b/store_backend/config/settings/common.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 """
-Django settings for mysite project.
+Django settings for store_backend project.
 
-Generated by 'django-admin startproject' using Django 4.0.
+Generated by 'django-admin startproject' using Django 4.2.5.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/4.0/topics/settings/
+https://docs.djangoproject.com/en/4.2/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/4.0/ref/settings/
+https://docs.djangoproject.com/en/4.2/ref/settings/
 """
 
 from pathlib import Path
@@ -95,7 +95,7 @@
 
 
 # Database
-# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
+# https://docs.djangoproject.com/en/4.2/ref/settings/#databases
 
 DATABASES = {
     'default': {
@@ -105,7 +105,7 @@
 
 
 # Password validation
-# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -124,26 +124,23 @@
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/4.0/topics/i18n/
+# https://docs.djangoproject.com/en/4.2/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
 TIME_ZONE = 'America/New_York'
 
 USE_I18N = True
 
-USE_L10N = True
-
 USE_TZ = True
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/4.0/howto/static-files/
-
-STATIC_URL = '/static/'
+# https://docs.djangoproject.com/en/4.2/howto/static-files/
 
+STATIC_URL = 'static/'
 
 # Default primary key field type
-# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
+# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
diff --git a/store_backend/config/settings/local.py b/store_backend/config/settings/local.py
@@ -11,20 +11,19 @@
 from .common import *  # noqa
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'w1kxu^l=@pnsf!5piqz6!!5kdcdpo79y6jebbp+2244yjm*#+k'
-
-# Hosts/domain names that are valid for this site
-# See https://docs.djangoproject.com/en/4.0/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = ['*']
+SECRET_KEY = 'django-insecure-tvtw1#&s4i9pxosr^2rnwdh0o1-ka-l+u6(@t+c)#864((*3$4'
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
+# See https://docs.djangoproject.com/en/4.2/ref/settings/#allowed-hosts
+ALLOWED_HOSTS = ['*']
+
 # LOGGING CONFIGURATION
-# See https://docs.djangoproject.com/en/4.0/topics/logging/ for
+# See https://docs.djangoproject.com/en/4.2/topics/logging/ for
 # more details on how to customize your logging configuration.
 LOGGING = {
     'version': 1,
@@ -68,7 +67,7 @@
 
 
 # Database
-# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
+# https://docs.djangoproject.com/en/4.2/ref/settings/#databases
 DATABASES['default']['NAME'] = 'chris_store_dev'
 DATABASES['default']['USER'] = 'chris'
 DATABASES['default']['PASSWORD'] = 'Chris1234'

diff --git a/store_backend/config/settings/production.py b/store_backend/config/settings/production.py
@@ -27,22 +27,20 @@ def get_secret(setting, secret_type=env):
 
 # SECRET CONFIGURATION
 # ------------------------------------------------------------------------------
-# See: https://docs.djangoproject.com/en/4.0/ref/settings/#secret-key
-# Raises ImproperlyConfigured exception if DJANGO_SECRET_KEY not in os.environ
+# See: https://docs.djangoproject.com/en/4.2/ref/settings/#secret-key
 SECRET_KEY = get_secret('DJANGO_SECRET_KEY')
 
 
 # SITE CONFIGURATION
 # ------------------------------------------------------------------------------
 # Hosts/domain names that are valid for this site
-# See https://docs.djangoproject.com/en/4.0/ref/settings/#allowed-hosts
+# See https://docs.djangoproject.com/en/4.2/ref/settings/#allowed-hosts
 ALLOWED_HOSTS = get_secret('DJANGO_ALLOWED_HOSTS', env.list)
 # END SITE CONFIGURATION
 
 
 # DATABASE CONFIGURATION
 # ------------------------------------------------------------------------------
-# Raises ImproperlyConfigured exception if DATABASE_URL not in os.environ
 DATABASES['default']['NAME'] = get_secret('POSTGRES_DB')
 DATABASES['default']['USER'] = get_secret('POSTGRES_USER')
 DATABASES['default']['PASSWORD'] = get_secret('POSTGRES_PASSWORD')
@@ -51,7 +49,7 @@ def get_secret(setting, secret_type=env):
 
 
 # LOGGING CONFIGURATION
-# See https://docs.djangoproject.com/en/4.0/topics/logging/ for
+# See https://docs.djangoproject.com/en/4.2/topics/logging/ for
 # more details on how to customize your logging configuration.
 ADMINS = [('FNNDSC Developers', 'dev@babymri.org')]
 LOGGING = {

diff --git a/store_backend/config/urls.py b/store_backend/config/urls.py
@@ -1,7 +1,8 @@
-"""mysite URL Configuration
+"""
+URL configuration for store_backend project.
 
 The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/4.0/topics/http/urls/
+    https://docs.djangoproject.com/en/4.2/topics/http/urls/
 Examples:
 Function views
     1. Add an import:  from my_app import views

diff --git a/store_backend/config/wsgi.py b/store_backend/config/wsgi.py
@@ -1,10 +1,10 @@
 """
-WSGI config for mysite project.
+WSGI config for store_backend project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/4.0/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/4.2/howto/deployment/wsgi/
 """
 
 import os, sys

diff --git a/store_backend/migratedb.py b/store_backend/migratedb.py
@@ -2,7 +2,7 @@
 
 import time
 import sys
-import psycopg2
+import psycopg
 from argparse import ArgumentParser
 
 # django needs to be loaded
@@ -31,8 +31,8 @@
 db = None
 while max_tries > 0 and db is None:
     try:
-        db = psycopg2.connect(host=host, user=args.user, password=args.password,
-                              dbname=args.database)
+        db = psycopg.connect(host=host, user=args.user, password=args.password,
+                             dbname=args.database)
     except Exception:
         time.sleep(5)
         max_tries -= 1

diff --git a/swarm/prod/docker-compose.yml b/swarm/prod/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       role: "Production server using Apache's mod_wsgi"
 
   chris_store_db:
-    image: postgres:13
+    image: postgres:16
     volumes:
       - chris_store_db_data:/var/lib/postgresql/data
     env_file: