Upgrade Django to v5; related work and cleanups

.envrc

@@ -0,0 +1,38 @@
+# Modified from the Direnv wiki entry for Poetry
+# It has been adjusted to check for files more thoroughly and if they are missing request corrective action.
+deploy_poetry() {
+  PYPROJECT_TOML="${PYPROJECT_TOML:-pyproject.toml}"
+  if [[ ! -f "$PYPROJECT_TOML" ]]; then
+      log_status "No pyproject.toml found. Run \`poetry init\` manually to create a \`$PYPROJECT_TOML\` first."
+      return
+  fi
+
+  if [[ -d ".venv" ]]; then
+      VIRTUAL_ENV="$(pwd)/.venv"
+  else
+      VIRTUAL_ENV=$(poetry env info --path 2>/dev/null ; true)
+  fi
+
+  if [[ -z $VIRTUAL_ENV || ! -d $VIRTUAL_ENV ]]; then
+      log_status "No virtual environment exists. Executing \`poetry install\` to create one."
+      poetry install
+      VIRTUAL_ENV=$(poetry env info --path)
+  fi
+
+  PATH_add "$VIRTUAL_ENV/bin"
+  export POETRY_ACTIVE=1  # or VENV_ACTIVE=1
+  export VIRTUAL_ENV
+
+  LOCKFILE_OK=$(poetry check --lock 2>&1 /dev/null ; true)
+  if [[ -z LOCKFILE_OK ]]; then
+    poetry lock --no-update
+  fi
+
+  poetry install --sync
+}
+
+# Install packages from Nix and setup some of the development environment
+use flake
+
+# Install Python specific modules modules related to Poetry
+deploy_poetry

.gitignore

@@ -9,11 +9,13 @@ test-db.sqlite3
 registration/resources/nametag/apis/tmp*.html
 .idea/
 .coverage
-.envrc
 fm_eventmanager/maintenance_mode_state.txt
 localhost.crt
 localhost.key
 venv3/
 .env
 htmlcov/
 .DS_Store
+.direnv/
+registration/migrations/
+

flake.nix

@@ -0,0 +1,49 @@
+{
+  description = "Define development dependencies.";
+
+  inputs = {
+    # Which Nix upstream package branch to track
+    nixpkgs.url = "nixpkgs/nixos-unstable";
+  };
+
+  # What results we're going to expose
+  outputs = { self, nixpkgs }:
+    let
+      # What packages and system functions we'll use
+      pkgs = import nixpkgs {  system = "x86_64-linux"; };
+      # What version of Python we're going to explicitly track
+      # NOTE: This doesn't explicitly track with what is in packages and so
+      # will break at some point in the future.
+      python_name = "python3.12";
+      python = pkgs.python312;
+    in {
+
+      # Declare what packages we need as a record. The use as a record is
+      # needed because, without it, the data contained within can't be
+      # referenced in other parts of this file.
+      devShells.x86_64-linux.default = pkgs.mkShell rec {
+        packages = with pkgs; [
+          python3Full
+          (poetry.override { python3 = python; })
+          direnv
+          gcc-unwrapped
+          stdenv
+          wkhtmltopdf
+          postgresql
+          ruff
+          # NOTE: Put additional packages you need in this array. Packages may be found by looking them up in
+          # https://search.nixos.org/packages
+        ];
+
+        # Getting the library paths needed for Python to be put into
+        # LD_LIBRARY_PATH
+        pythonldlibpath = "${pkgs.stdenv.cc.cc.lib}/lib:${pkgs.stdenv.cc.cc.lib.outPath}/lib:${pkgs.lib.makeLibraryPath packages}";
+
+        # Run the following on the shell, which builds up LD_LIBRARY_PATH.
+        shellHook = ''
+        export LD_LIBRARY_PATH="${pythonldlibpath}"
+        '';
+
+      };
+  };
+}

fm_eventmanager/asgi.py

@@ -0,0 +1,16 @@
+"""
+ASGI config for fm_eventmanager 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.2/howto/deployment/asgi/
+"""
+
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "fm_eventmanager.settings")
+
+application = get_asgi_application()

fm_eventmanager/urls.py

@@ -1,27 +1,29 @@
-import django_u2f.urls
 from django.conf import settings
-from django.conf.urls import include, url
 from django.contrib import admin
 from django.views.generic import RedirectView
 from django.http import HttpResponse
+from django.urls import include, path
+# import django_u2f.urls
 
 admin.autodiscover()
 
 urlpatterns = [
-    url(
-        r"robots.txt",
-        lambda x: HttpResponse("User-Agent: *\n\nDisallow: /", content_type="text/plain"),
-        name="robots_file"
+    path(
+        "robots.txt",
+        lambda x: HttpResponse(
+            "User-Agent: *\n\nDisallow: /", content_type="text/plain"
+        ),
+        name="robots_file",
     ),
-    url(r"^registration/", include("registration.urls", namespace="registration")),
-    url(r"^admin/", admin.site.urls),
-    url(r"^u2f/", include(django_u2f.urls, namespace="u2f")),
-    url(r"^$", RedirectView.as_view(url="registration"), name="root"),
+    path("registration/", include("registration.urls", namespace="registration")),
+    path("admin/", admin.site.urls),
+    # path("u2f/", include(django_u2f.urls, namespace="u2f")),
+    path("", RedirectView.as_view(url="registration"), name="root"),
 ]
 
 if settings.DEBUG:
     import debug_toolbar
 
     urlpatterns = [
-        url(r"^__debug__/", include(debug_toolbar.urls)),
+        path("__debug__/", include(debug_toolbar.urls)),
     ] + urlpatterns

manage.py

@@ -1,10 +1,23 @@
 #!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 
-if __name__ == "__main__":
+
+def main():
+    """Run administrative tasks."""
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "fm_eventmanager.settings")
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
 
-    from django.core.management import execute_from_command_line
 
-    execute_from_command_line(sys.argv)
+if __name__ == "__main__":
+    main()