Repo consistency

.github/workflows/docker-build.yaml

@@ -5,7 +5,7 @@ on:
   push:
     branches:
       - master
-
+      - repo-consistency
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/test.yaml

@@ -21,14 +21,25 @@ jobs:
     env:
       DATABASE_URL: postgres://postgres:postgres@localhost/reminder_scheduler
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v5.0.0
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.9'
-          cache: 'pip'
-      - name: Install dependancies
-        run: pip install -r requirements.txt -r requirements-dev.txt
+      - uses: abatilo/actions-poetry@v3
+      - name: Install dependencies
+        id: install-deps
+        run: |
+          poetry install
+      - name: Check formatting
+        # Lints/tests should always run, even if other lints/tests have failed.
+        if: success() || failure() && steps.install-deps.outcome == 'success'
+        run: |
+          poetry run ruff format --check 
+      - name: Lint
+        if: success() || failure() && steps.install-deps.outcome == 'success'
+        run: |
+          poetry run ruff check 
       - name: Run tests
+        if: success() || failure() && steps.install-deps.outcome == 'success'
         run: |
-          python manage.py makemigrations --check
-          pytest
+          poetry run pytest -vv

Dockerfile

@@ -1,11 +1,9 @@
-FROM ghcr.io/praekeltfoundation/docker-django-bootstrap-nw:py3.9
-
-COPY ./requirements.txt /app/
-COPY ./setup.py /app/
-
-RUN pip install -r /app/requirements.txt
+FROM ghcr.io/praekeltfoundation/docker-django-bootstrap-nw:py3.10-buster
 
+RUN pip install poetry==1.8.3
 COPY . /app
+RUN poetry config virtualenvs.create false \
+    && poetry install --no-dev --no-interaction --no-ansi --no-cache
 
 # temporary untill there is a new PyCap Release
 ENV DJANGO_SETTINGS_MODULE "config.settings.production"

config/__init__.py

@@ -1,3 +1,3 @@
 from .celery import app as celery_app
 
-__all__ = ('celery_app',)
+__all__ = ("celery_app",)

config/celery.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import os
 
 import sentry_sdk
@@ -10,7 +8,7 @@
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.production")
 
-app = Celery('')
+app = Celery("")
 
 # Using a string here means the worker doesn't have to serialize
 # the configuration object to child processes.
@@ -19,10 +17,12 @@
 app.config_from_object("django.conf:settings")
 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
 
+
 @app.task(bind=True)
 def debug_task(self):
     print("Request: {0!r}".format(self.request))  # noqa
 
+
 # only connect to sentry if dsn is supplied
 if settings.SENTRY_DSN:
     sentry_sdk.init(dsn=settings.SENTRY_DSN, integrations=[CeleryIntegration()])

config/settings/base.py

@@ -8,7 +8,6 @@
 import dj_database_url
 import environ
 from celery.schedules import crontab
-from kombu import Exchange, Queue
 
 root = environ.Path(__file__) - 3
 env = environ.Env(DEBUG=(bool, False))
@@ -85,7 +84,7 @@
 
 DATABASES = {
     "default": dj_database_url.config(
-        default="sqlite:///%s" % (join(BASE_DIR, "db.sqlite3"),)
+        default="sqlite:///{}".format(join(BASE_DIR, "db.sqlite3"))
     )
 }
 
@@ -133,8 +132,8 @@
 SENTRY_DSN = env.str("SENTRY_DSN", "")
 
 REST_FRAMEWORK = {
-    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
-    'PAGE_SIZE': 10
+    "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.PageNumberPagination",
+    "PAGE_SIZE": 10,
 }
 
 # Celery configuration options
@@ -152,15 +151,15 @@
 
 CELERY_ALWAYS_EAGER = False
 
-CELERY_TASK_SERIALIZER = 'json'
-CELERY_RESULT_SERIALIZER = 'json'
-CELERY_ACCEPT_CONTENT = ['json']
+CELERY_TASK_SERIALIZER = "json"
+CELERY_RESULT_SERIALIZER = "json"
+CELERY_ACCEPT_CONTENT = ["json"]
 
 CELERYBEAT_SCHEDULE = {
     "reminder_check": {
-        "task": 'scheduler.tasks.check_for_scheduled_reminders',
+        "task": "scheduler.tasks.check_for_scheduled_reminders",
         "schedule": crontab(minute="*"),
-        "kwargs":{},
+        "kwargs": {},
     },
 }
 

config/settings/test.py

@@ -1,7 +1,7 @@
 from .base import *  # noqa
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = "TESTSEKRET"
+SECRET_KEY = "TESTSEKRET"  # noqa: S105 - Fake password/token for test purposes
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True

config/urls.py

@@ -4,7 +4,7 @@
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("", include("scheduler.urls")),  # To be removed
-    path("scheduler/", include("scheduler.urls")), # To be removed
+    path("scheduler/", include("scheduler.urls")),  # To be removed
     path("quickreplies/", include("quickreplies.urls")),
     path("rapidpro_api/", include("rapidpro_api.urls")),
 ]

manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys