Merge pull request #14 from testdrivenio/feature/1.3.2

Feature/1.3.2

Author: mjhea0

compose/local/django/Dockerfile

@@ -1,12 +1,12 @@
-FROM python:3.11-slim-buster
+FROM python:3.12-slim-bullseye
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
 
 RUN apt-get update \
   # dependencies for building Python packages
   && apt-get install -y build-essential \
-  # psycopg2 dependencies
+  # psycopg dependencies
   && apt-get install -y libpq-dev \
   # Translations dependencies
   && apt-get install -y gettext \

compose/local/django/celery/beat/start

@@ -4,4 +4,4 @@ set -o errexit
 set -o nounset
 
 rm -f './celerybeat.pid'
-celery -A django_celery_example beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler
+celery -A django_celery_example beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler

compose/local/django/entrypoint

@@ -11,17 +11,17 @@ postgres_ready() {
 python << END
 import sys
 
-import psycopg2
+import psycopg
 
 try:
-    psycopg2.connect(
+    psycopg.connect(
         dbname="${SQL_DATABASE}",
         user="${SQL_USER}",
         password="${SQL_PASSWORD}",
         host="${SQL_HOST}",
         port="${SQL_PORT}",
     )
-except psycopg2.OperationalError:
+except psycopg.OperationalError:
     sys.exit(-1)
 sys.exit(0)
 

compose/production/django/Dockerfile

@@ -1,11 +1,11 @@
-FROM python:3.11-slim-buster
+FROM python:3.12-slim-bullseye
 
 ENV PYTHONUNBUFFERED 1
 
 RUN apt-get update \
   # dependencies for building Python packages
   && apt-get install -y build-essential netcat \
-  # psycopg2 dependencies
+  # psycopg dependencies
   && apt-get install -y libpq-dev \
   # Translations dependencies
   && apt-get install -y gettext \

compose/production/django/celery/flower/start

@@ -17,4 +17,5 @@ exec celery -A django_celery_example \
     --broker="${CELERY_BROKER}" \
     flower \
     --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}" \
-    --persistent=1 --db=/app/flower_db/flower.db --state_save_interval=5000
+    --persistent=1 --db=/app/flower_db/flower.db --state_save_interval=5000
+

compose/production/django/celery/worker/start

@@ -4,4 +4,4 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-exec celery -A django_celery_example worker -l INFO
+exec celery -A django_celery_example worker -l INFO

compose/production/django/entrypoint

@@ -8,17 +8,17 @@ postgres_ready() {
 python << END
 import sys
 
-import psycopg2
+import psycopg
 
 try:
-    psycopg2.connect(
+    psycopg.connect(
         dbname="${SQL_DATABASE}",
         user="${SQL_USER}",
         password="${SQL_PASSWORD}",
         host="${SQL_HOST}",
         port="${SQL_PORT}",
     )
-except psycopg2.OperationalError:
+except psycopg.OperationalError:
     sys.exit(-1)
 sys.exit(0)
 

compose/production/nginx/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.25.3-alpine
+FROM nginx:1.27.3-alpine
 
 RUN rm /etc/nginx/conf.d/default.conf
-COPY nginx.conf /etc/nginx/conf.d
+COPY nginx.conf /etc/nginx/conf.d

compose/production/nginx/nginx.conf

@@ -55,4 +55,4 @@ server {
         proxy_set_header Host $host;
         proxy_redirect off;
     }
-}
+}

db.sqlite3

@@ -4,7 +4,7 @@
 It exposes the ASGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/5.0/howto/deployment/asgi/
+https://docs.djangoproject.com/en/5.1/howto/deployment/asgi/
 """
 
 import os

django_celery_example/asgi.py

@@ -4,6 +4,7 @@
 import os
 import logging
 from celery.signals import after_setup_logger
+
 from celery import Celery
 
 from django.conf import settings
@@ -40,3 +41,4 @@ def on_after_setup_logger(logger, **kwargs):
     file_handler = logging.FileHandler('celery.log')
     file_handler.setFormatter(formatter)
     logger.addHandler(file_handler)
+

django_celery_example/celery.py

@@ -1,13 +1,13 @@
 """
 Django settings for django_celery_example project.
 
-Generated by 'django-admin startproject' using Django 5.0.
+Generated by 'django-admin startproject' using Django 5.1.5.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/5.0/topics/settings/
+https://docs.djangoproject.com/en/5.1/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/5.0/ref/settings/
+https://docs.djangoproject.com/en/5.1/ref/settings/
 """
 import os
 from pathlib import Path
@@ -18,7 +18,7 @@
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/5.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = os.environ.get("SECRET_KEY", "&nl8s430j^j8l*je+m&ys5dv#zoy)0a2+x1!m8hx290_sx&0gh")
@@ -39,9 +39,9 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'polls',
     'channels',
     'django_celery_beat',
+    'polls',
     'tdd',
 ]
 
@@ -76,8 +76,9 @@
 # WSGI_APPLICATION = 'django_celery_example.wsgi.application'
 ASGI_APPLICATION = 'django_celery_example.asgi.application'
 
+
 # Database
-# https://docs.djangoproject.com/en/5.0/ref/settings/#databases
+# https://docs.djangoproject.com/en/5.1/ref/settings/#databases
 
 DATABASES = {
     "default": {
@@ -92,7 +93,7 @@
 
 
 # Password validation
-# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -111,7 +112,7 @@
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/5.0/topics/i18n/
+# https://docs.djangoproject.com/en/5.1/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -123,7 +124,7 @@
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/5.0/howto/static-files/
+# https://docs.djangoproject.com/en/5.1/howto/static-files/
 
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
@@ -132,7 +133,7 @@
 MEDIA_ROOT = os.path.join(BASE_DIR, 'mediafiles')
 
 # Default primary key field type
-# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field
+# https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
@@ -168,7 +169,6 @@
     Queue('low_priority'),
 )
 
-
 def route_task(name, args, kwargs, options, task=None, **kw):
     if ':' in name:
         queue, _ = name.split(':')

django_celery_example/settings.py

@@ -2,7 +2,7 @@
 URL configuration for django_celery_example project.
 
 The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/5.0/topics/http/urls/
+    https://docs.djangoproject.com/en/5.1/topics/http/urls/
 Examples:
 Function views
     1. Add an import:  from my_app import views
@@ -23,3 +23,4 @@
     path('member/', include('tdd.urls')),
     path('', include('polls.urls')),
 ]
+

django_celery_example/urls.py

@@ -4,7 +4,7 @@
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/5.0/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/5.1/howto/deployment/wsgi/
 """
 
 import os

django_celery_example/wsgi.py

@@ -30,7 +30,7 @@ services:
       - db
 
   db:
-    image: postgres:16-alpine
+    image: postgres:17-alpine
     volumes:
       - postgres_data:/var/lib/postgresql/data/
     environment:
@@ -42,7 +42,7 @@ services:
     image: redis:7-alpine
 
   rabbitmq:
-    image: rabbitmq:3-management
+    image: rabbitmq:4-management
     env_file:
       - ./.env/.prod-sample
 
@@ -113,9 +113,9 @@ services:
       - /var/lib/docker/:/var/lib/docker:ro
       - /var/run/docker.sock:/var/run/docker.sock:ro
 
-
 volumes:
   postgres_data:
   staticfiles:
   mediafiles:
-  flower_db:
+  flower_db:
+

docker-compose.prod.yml

@@ -53,4 +53,4 @@ def _get_retry_countdown(self, task_func):
             full_jitter=retry_jitter
         )
 
-        return countdown
+        return countdown

polls/base_task.py

@@ -64,4 +64,4 @@ async def disconnect(self, close_code):
     async def update_task_status(self, event):
         data = event['data']
 
-        await self.send(text_data=json.dumps(data))
+        await self.send(text_data=json.dumps(data))

polls/consumers.py

@@ -14,4 +14,5 @@ class Meta:
     email = LazyAttribute(lambda o: '%[email protected]' % o.username)
     password = LazyAttribute(lambda o: make_password(o.username))
     first_name = Faker("first_name")
-    last_name = Faker("last_name")
+    last_name = Faker("last_name")
+

polls/factories.py

@@ -20,3 +20,4 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         print("Starting celery worker with autoreload...")
         autoreload.run_with_reloader(restart_celery)
+

polls/management/__init__.py

@@ -5,4 +5,5 @@
 
 urlpatterns = [
     path('ws/task_status/<task_id>/', consumers.TaskStatusConsumer.as_asgi()),
-]
+]
+

polls/management/commands/__init__.py

@@ -48,7 +48,6 @@ def task_clear_session():
     from django.core.management import call_command
     call_command('clearsessions')
 
-
 @shared_task(name='default:dynamic_example_one')
 def dynamic_example_one():
     logger.info('Example One')
@@ -96,3 +95,4 @@ def task_transaction_test():
     logger.info(f'send email to {user.pk}')
     # this cause db rollback because of transaction.atomic
     raise Exception('test')
+