release/sprint-82 -> release/test

.circleci/config.yml

@@ -5,20 +5,22 @@ version: 2.1
 # See: https://circleci.com/docs/2.0/orb-intro/
 orbs:
   # See the orb documentation here: https://circleci.com/developer/orbs/orb/circleci/python
-  python: circleci/python@3.2.0
-  browser-tools: circleci/browser-tools@2.2.1
-  node: circleci/node@7.1.1
+  python: circleci/python@4.0.0
+  node: circleci/node@7.2.1
 
-# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
-jobs:
-  test:
-    # These next lines defines a Docker executors: https://circleci.com/docs/2.0/executor-types/
-    # A list of available CircleCI Docker convenience images are available here: https://circleci.com/developer/images/image/cimg/python
-    docker:
-      - image: cimg/python:3.13-node
-      - image: cimg/postgres:14.13
-      - image: cimg/redis:6.2.6
+commands:
+  unified-requirements-cache:
+    steps:
+      - run:
+          name: Create unified requirements so CircleCI can cache them
+          command: |
+            cd ~/project/
+            ls -l
+            cat requirements.txt > requirements-all.txt
+            echo >> requirements-all.txt  # blank in case new newline at end of requirements.txt
+            cat requirements-test.txt >> requirements-all.txt
 
+  check-env-vars:
     steps:
       - run:
           name: Check for necessary environment variables
@@ -29,62 +31,37 @@ jobs:
             FECFILE_FEC_WEBSITE_API_KEY
             EOF
             exit 0
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  test:
+    # These next lines defines a Docker executors: https://circleci.com/docs/2.0/executor-types/
+    # A list of available CircleCI Docker convenience images are available here: https://circleci.com/developer/images/image/cimg/python
+    docker:
+      - image: &python313_image cimg/python:3.13-node
+      - image: cimg/postgres:14.13
+      - image: cimg/redis:6.2.6
+    resource_class: large
 
+    steps:
+      - check-env-vars
       - checkout:
           method: full
 
-      - run:
-          name: Create unified requirements so CircleCI can cache them
-          command: |
-            cd ~/project/
-            ls -l
-            cat requirements.txt > requirements-all.txt
-            echo >> requirements-all.txt  # blank in case new newline at end of requirements.txt
-            cat requirements-test.txt >> requirements-all.txt
-
+      - unified-requirements-cache
       - python/install-packages:
           pkg-manager: pip
           app-dir: ~/project/
           pip-dependency-file: requirements-all.txt
 
       - run:
-          name: Load test database fixure
-          command: |
-            psql ${DATABASE_URL} < e2e-test-db.sql
-          working_directory: ~/project/db
-
-      - run:
-          name: Check for missing migrations
-          command: |
-            python manage.py makemigrations --check
-          working_directory: ~/project/django-backend/
-
-      - run:
-          name: Check for breaking change migrations
-          # After December 2024
-          command: |
-            python manage.py lintmigrations --git-commit-id d73068e23fc5b035af2b224b16d4726b7b20d67c --project-root-path '.'
-          working_directory: ~/project/django-backend/
-
-      - run:
-          name: Run migrations
-          command: |
-            python manage.py migrate --no-input --traceback --verbosity 3
+          name: Run tests
+          # Use built-in Django test module
+          command: coverage run --rcfile=.coveragerc manage.py test --parallel 4 --timing
           working_directory: ~/project/django-backend/
 
       - run:
-          name: Run lint
-          command: |
-            flake8 --config django-backend/.flake8
-
-      - run:
-          name: Run deptry
-          command: deptry ~/project/
-
-      - run:
-          name: Run tests
-          # Use built-in Django test module
-          command: coverage run --source='.' --rcfile=.coveragerc manage.py test
+          name: Combine coverage data
+          command: coverage combine --rcfile=.coveragerc
           working_directory: ~/project/django-backend/
 
       - run:
@@ -133,14 +110,84 @@ jobs:
             SONARQUBE_SCANNER_PARAMS: '{"sonar.host.url":"https://sonarcloud.io"}'
       - save_cache:
           key: v1-sonarcloud-scanner-7.1.0.4889
-          paths: /tmp/cache/scanner
+          paths:
+            - /tmp/cache/scanner
       - store_artifacts:
           path: /tmp/sonar_report
           destination: sonar_report
 
+  schema-checks:
+    docker:
+      - image: *python313_image
+      - image: cimg/postgres:14.13
+      - image: cimg/redis:6.2.6
+
+    steps:
+      - check-env-vars
+      - checkout:
+          method: full
+
+      - unified-requirements-cache
+      - python/install-packages:
+          pkg-manager: pip
+          app-dir: ~/project/
+          pip-dependency-file: requirements-all.txt
+
+      - run:
+          name: Check for missing migrations
+          command: |
+            python manage.py makemigrations --check
+          working_directory: ~/project/django-backend/
+
+      - run:
+          name: Check for breaking change migrations
+          # After December 2024
+          command: |
+            python manage.py lintmigrations --git-commit-id d73068e23fc5b035af2b224b16d4726b7b20d67c --project-root-path '.'
+          working_directory: ~/project/django-backend/
+
+      - run:
+          name: Run migrations
+          command: |
+            python manage.py migrate --no-input --traceback --verbosity 3
+          working_directory: ~/project/django-backend/
+
+  lint:
+    docker:
+      - image: *python313_image
+
+    steps:
+      - checkout
+      - unified-requirements-cache
+      - python/install-packages:
+          pkg-manager: pip
+          app-dir: ~/project/
+          pip-dependency-file: requirements-all.txt
+
+      - run:
+          name: Run lint
+          command: |
+            flake8 --config django-backend/.flake8
+
+  dependency-check:
+    docker:
+      - image: *python313_image
+
+    steps:
+      - checkout
+      - unified-requirements-cache
+      - python/install-packages:
+          pkg-manager: pip
+          app-dir: ~/project/
+          pip-dependency-file: requirements-all.txt
+
+      - run:
+          name: Run deptry
+          command: deptry ~/project/
+
   deploy-job:
     docker:
-      - image: cimg/python:3.13
+      - image: *python313_image
 
     steps:
       - checkout
@@ -164,20 +211,11 @@ jobs:
 
   docs-build:
     docker:
-      - image: cimg/python:3.13
+      - image: *python313_image
 
     steps:
       - checkout
-
-      - run:
-          name: Create unified requirements so CircleCI can cache them
-          command: |
-            cd ~/project/
-            ls -l
-            cat requirements.txt > requirements-all.txt
-            echo >> requirements-all.txt  # blank in case new newline at end of requirements.txt
-            cat requirements-test.txt >> requirements-all.txt
-
+      - unified-requirements-cache
       - python/install-packages:
           pkg-manager: pip
           app-dir: ~/project/
@@ -190,7 +228,8 @@ jobs:
 
       - persist_to_workspace:
           root: ~/project/docs/_build
-          paths: html
+          paths:
+            - html
 
   docs-deploy:
     docker:
@@ -244,6 +283,9 @@ jobs:
 workflows:
   primary: # This is the name of the workflow, feel free to change it to better match your workflow.
     jobs:
+      - lint
+      - dependency-check
+      - schema-checks
       - test
       # This job is triggered whenever a commit is made to the dev/stage/test/prod branches.
       # It kicks off the e2e-test pipeline in the fecfile-web-app project.
@@ -253,6 +295,9 @@ workflows:
               only: /develop|release\/sprint-[\.\d]+|release\/test|main/
       - deploy-job:
           requires:
+            - lint
+            - dependency-check
+            - schema-checks
             - test
           filters:
             branches:

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12
+FROM python:3.13
 ENV PYTHONUNBUFFERED=1
 
 RUN mkdir /opt/nxg_fec

Dockerfile-e2e

@@ -1,4 +1,4 @@
-FROM python:3.12
+FROM python:3.13
 ENV PYTHONUNBUFFERED=1
 
 RUN mkdir /opt/nxg_fec_e2e

Scheduler_Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12
+FROM python:3.13
 ENV PYTHONUNBUFFERED=1
 
 RUN mkdir /opt/nxg_fec

Worker_Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12
+FROM python:3.13
 ENV PYTHONUNBUFFERED=1
 
 RUN mkdir /opt/nxg_fec

Worker_Dockerfile-e2e

@@ -1,4 +1,4 @@
-FROM python:3.12
+FROM python:3.13
 ENV PYTHONUNBUFFERED=1
 
 RUN mkdir /opt/nxg_fec_e2e

django-backend/.coveragerc

@@ -1,6 +1,9 @@
 # .coveragerc to control coverage.py
 # https://coverage.readthedocs.io/en/coverage-4.3.3/source.html#execution
 [run]
+source = .
+parallel = True
+concurrency = multiprocessing
 omit =
     # Excluding dev scripts from code coverage
     ./scripts/json_schema_to_django_model.py

django-backend/fecfiler/cash_on_hand/migrations/0001_initial.py → django-backend/fecfiler/cash_on_hand/migrations/0001_squashed_0002_alter_cashonhandyearly_cash_on_hand_and_more.py

@@ -1,15 +1,21 @@
-# Generated by Django 4.2.7 on 2024-01-16 20:15
+# Generated by Django 5.2.11 on 2026-03-06 21:37
 
 from django.db import migrations, models
 import django.db.models.deletion
 import uuid
 
 
 class Migration(migrations.Migration):
+
+    replaces = [
+        ("cash_on_hand", "0001_initial"),
+        ("cash_on_hand", "0002_alter_cashonhandyearly_cash_on_hand_and_more"),
+    ]
+
     initial = True
 
     dependencies = [
-        ("committee_accounts", "0001_initial"),
+        ("committee_accounts", "0001_squashed_0007_alter_committeeaccount_members"),
     ]
 
     operations = [
@@ -26,13 +32,8 @@ class Migration(migrations.Migration):
                         unique=True,
                     ),
                 ),
-                (
-                    "cash_on_hand",
-                    models.DecimalField(
-                        blank=True, decimal_places=2, max_digits=11, null=True
-                    ),
-                ),
-                ("year", models.TextField(blank=True, null=True)),
+                ("cash_on_hand", models.DecimalField(decimal_places=2, max_digits=11)),
+                ("year", models.TextField()),
                 ("created", models.DateTimeField(auto_now_add=True)),
                 ("updated", models.DateTimeField(auto_now=True)),
                 (