mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-10 06:25:41 +00:00
Port to Django 5.2 (#635)
* Port to Django 5.2 * Pin pluggy to 1.2.0 Any newer and the mystery importlib metadata error appears. Weird! >_> * Update for premailer changed default * Update view logic for is_ajax being changed to a template context processor * Port a few more tests to pytest proper Having two distinct test flavours is giving me a headache * Version 1 dockerfile Makes a VERY big image, I suspect we can optimise this a lot... * Optimise dockerfile a little lot a bit * fix(users): change logout link to POST request * fix(tests): fix some syntax errors in test code still got lots of failed tests :( * fix: replace deprecated Django APIs * ci: update Dockerfile * ci: update Dockerfile * fix(dependencies+tests): update EoL/vulnerable dependencies and improve test stability * Upgrade Python from 3.10 to 3.12 * Update frontend dependencies, replace node-sass with sass * chore(logging): ignore dangling obj reference warning from pypdf * ci: update compose.yml for prod deployment - Add Nginx as a reverse proxy - Add cert-selfsign.sh for generating self-signed certificates - Add certbot-issue.sh for Let's Encrypt certificate issuance and renewal - Add cron-install.sh and cron-uninstall.sh for system cron management - Add .env.example as an environment variable template * style: reformat code * ci: add more sleep trying to pass tests * ci: ignore browser-based tests during ci testing * fix: create home for the new user during Dockerfile building * chore: remove heroku conf file * fix: RIGS not franken anymore * fix: restore is_ajax as a boolean and split out the context processor * test: remove Selenium interaction tests and their CI workarounds * fix: harden production settings (CSRF origins, env casts, ADMINS) and drop dead debug toolbar code * deploy: serve static files from nginx, pin PGDATA, and make cert scripts loud on failure * build: switch .dockerignore to an allowlist * build: drop unused dependencies, soft-pin the rest and target Python 3.14 * build: move image to Python 3.14 / Node 24 and force DEBUG off * ci: add dependabot config for uv, npm, docker and actions * build: narrow Sass deprecation silencing to @import and require Node 24 * build: provide placeholder env for collectstatic now that DEBUG is off in the image * deploy: add plain-HTTP nginx config for local development and use it in compose * deploy: remove self-signed cert script * build: make the image multi-arch with official node and python base images * ci: lint and test on PRs, build the image on PRs and push it to GHCR on master * docs: add local running and sample data instructions * fix: report a form error instead of crashing when big power has no Power MIC * fix: upgrade pypdf and urllib3 to patched releases * fix: apply non-breaking npm audit fixes * fix: strip whitespace in ALLOWED_HOSTS and drop misleading HSTS preload * deploy: add a pyrigs healthcheck and make nginx wait for it * build: pin the uv image version * fix: correct the check-in person picker condition and use BeautifulSoup's string argument * refactor: replace unique_together with UniqueConstraint * build: replace pycodestyle with ruff and fix what it found Removes unused imports and variables, and fixes a few real problems it surfaced: - EventCheckIn.active() referenced an undefined name and raised NameError; it now returns whether the check-in has no end time - RIGS.admin defined EventChecklistAdmin twice; the second is now PowerTestRecordAdmin - RIGS/tests/conftest.py used date/timedelta without importing them - the signal-registering imports in apps.py are kept with noqa pycodestyle config in setup.cfg is dropped. * style: format the codebase with ruff * style: normalise line endings, trailing whitespace and end-of-file newlines * ci: run ruff and file hygiene through prek, and document it --------- Co-authored-by: Hang <me@hangxu.me> Co-authored-by: Joe Banks <joe@jb3.dev>
This commit is contained in:
GitHub
@@ -1,3 +1,5 @@
|
||||
from datetime import date, timedelta
|
||||
|
||||
from RIGS import models
|
||||
import pytest
|
||||
from django.utils import timezone
|
||||
@@ -12,15 +14,31 @@ def basic_event(db):
|
||||
|
||||
@pytest.fixture
|
||||
def ra(basic_event, admin_user):
|
||||
ra = models.RiskAssessment.objects.create(event=basic_event, nonstandard_equipment=False, nonstandard_use=False,
|
||||
contractors=False, other_companies=False, crew_fatigue=False,
|
||||
big_power=False, power_mic=admin_user, generators=False,
|
||||
other_companies_power=False, nonstandard_equipment_power=False,
|
||||
multiple_electrical_environments=False, noise_monitoring=False,
|
||||
known_venue=True, safe_loading=True, safe_storage=True,
|
||||
area_outside_of_control=True, barrier_required=True,
|
||||
nonstandard_emergency_procedure=True, special_structures=False,
|
||||
suspended_structures=False, outside=False, parking_and_access=False)
|
||||
ra = models.RiskAssessment.objects.create(
|
||||
event=basic_event,
|
||||
nonstandard_equipment=False,
|
||||
nonstandard_use=False,
|
||||
contractors=False,
|
||||
other_companies=False,
|
||||
crew_fatigue=False,
|
||||
big_power=False,
|
||||
power_mic=admin_user,
|
||||
generators=False,
|
||||
other_companies_power=False,
|
||||
nonstandard_equipment_power=False,
|
||||
multiple_electrical_environments=False,
|
||||
noise_monitoring=False,
|
||||
known_venue=True,
|
||||
safe_loading=True,
|
||||
safe_storage=True,
|
||||
area_outside_of_control=True,
|
||||
barrier_required=True,
|
||||
nonstandard_emergency_procedure=True,
|
||||
special_structures=False,
|
||||
suspended_structures=False,
|
||||
outside=False,
|
||||
parking_and_access=False,
|
||||
)
|
||||
yield ra
|
||||
ra.delete()
|
||||
|
||||
@@ -43,11 +61,19 @@ def venue(db):
|
||||
|
||||
@pytest.fixture # TODO parameterise with Event sizes
|
||||
def checklist(basic_event, venue, admin_user, ra):
|
||||
checklist = models.EventChecklist.objects.create(event=basic_event, safe_parking=False,
|
||||
safe_packing=False, exits=False, trip_hazard=False, warning_signs=False,
|
||||
ear_plugs=False, hs_location="Locked away safely",
|
||||
extinguishers_location="Somewhere, I forgot",
|
||||
date=timezone.now(), venue=venue)
|
||||
checklist = models.EventChecklist.objects.create(
|
||||
event=basic_event,
|
||||
safe_parking=False,
|
||||
safe_packing=False,
|
||||
exits=False,
|
||||
trip_hazard=False,
|
||||
warning_signs=False,
|
||||
ear_plugs=False,
|
||||
hs_location="Locked away safely",
|
||||
extinguishers_location="Somewhere, I forgot",
|
||||
date=timezone.now(),
|
||||
venue=venue,
|
||||
)
|
||||
yield checklist
|
||||
checklist.delete()
|
||||
|
||||
@@ -63,52 +89,93 @@ def power_test(basic_event, venue, admin_user, ra):
|
||||
def many_events(db, admin_user, scope="class"):
|
||||
many_events = {
|
||||
# produce 7 normal events - 5 current
|
||||
1: models.Event.objects.create(name="TE E1", start_date=date.today() + timedelta(days=6),
|
||||
description="start future no end"),
|
||||
1: models.Event.objects.create(
|
||||
name="TE E1", start_date=date.today() + timedelta(days=6), description="start future no end"
|
||||
),
|
||||
2: models.Event.objects.create(name="TE E2", start_date=date.today(), description="start today no end"),
|
||||
3: models.Event.objects.create(name="TE E3", start_date=date.today(), end_date=date.today(),
|
||||
description="start today with end today"),
|
||||
4: models.Event.objects.create(name="TE E4", start_date='2014-03-20', description="start past no end"),
|
||||
5: models.Event.objects.create(name="TE E5", start_date='2014-03-20', end_date='2014-03-21',
|
||||
description="start past with end past"),
|
||||
6: models.Event.objects.create(name="TE E6", start_date=date.today() - timedelta(days=2),
|
||||
end_date=date.today() + timedelta(days=2),
|
||||
description="start past, end future"),
|
||||
7: models.Event.objects.create(name="TE E7", start_date=date.today() + timedelta(days=2),
|
||||
end_date=date.today() + timedelta(days=2),
|
||||
description="start + end in future"),
|
||||
|
||||
3: models.Event.objects.create(
|
||||
name="TE E3", start_date=date.today(), end_date=date.today(), description="start today with end today"
|
||||
),
|
||||
4: models.Event.objects.create(name="TE E4", start_date="2014-03-20", description="start past no end"),
|
||||
5: models.Event.objects.create(
|
||||
name="TE E5", start_date="2014-03-20", end_date="2014-03-21", description="start past with end past"
|
||||
),
|
||||
6: models.Event.objects.create(
|
||||
name="TE E6",
|
||||
start_date=date.today() - timedelta(days=2),
|
||||
end_date=date.today() + timedelta(days=2),
|
||||
description="start past, end future",
|
||||
),
|
||||
7: models.Event.objects.create(
|
||||
name="TE E7",
|
||||
start_date=date.today() + timedelta(days=2),
|
||||
end_date=date.today() + timedelta(days=2),
|
||||
description="start + end in future",
|
||||
),
|
||||
# 2 cancelled - 1 current
|
||||
8: models.Event.objects.create(name="TE E8", start_date=date.today() + timedelta(days=2),
|
||||
end_date=date.today() + timedelta(days=2), status=models.Event.CANCELLED,
|
||||
description="cancelled in future"),
|
||||
9: models.Event.objects.create(name="TE E9", start_date=date.today() - timedelta(days=1),
|
||||
end_date=date.today() + timedelta(days=2), status=models.Event.CANCELLED,
|
||||
description="cancelled and started"),
|
||||
|
||||
8: models.Event.objects.create(
|
||||
name="TE E8",
|
||||
start_date=date.today() + timedelta(days=2),
|
||||
end_date=date.today() + timedelta(days=2),
|
||||
status=models.Event.CANCELLED,
|
||||
description="cancelled in future",
|
||||
),
|
||||
9: models.Event.objects.create(
|
||||
name="TE E9",
|
||||
start_date=date.today() - timedelta(days=1),
|
||||
end_date=date.today() + timedelta(days=2),
|
||||
status=models.Event.CANCELLED,
|
||||
description="cancelled and started",
|
||||
),
|
||||
# 5 dry hire - 3 current
|
||||
10: models.Event.objects.create(name="TE E10", start_date=date.today(), dry_hire=True,
|
||||
description="dryhire today"),
|
||||
11: models.Event.objects.create(name="TE E11", start_date=date.today(), dry_hire=True,
|
||||
checked_in_by=admin_user,
|
||||
description="dryhire today, checked in"),
|
||||
12: models.Event.objects.create(name="TE E12", start_date=date.today() - timedelta(days=1), dry_hire=True,
|
||||
status=models.Event.BOOKED, description="dryhire past"),
|
||||
13: models.Event.objects.create(name="TE E13", start_date=date.today() - timedelta(days=2), dry_hire=True,
|
||||
checked_in_by=admin_user, description="dryhire past checked in"),
|
||||
14: models.Event.objects.create(name="TE E14", start_date=date.today(), dry_hire=True,
|
||||
status=models.Event.CANCELLED, description="dryhire today cancelled"),
|
||||
|
||||
10: models.Event.objects.create(
|
||||
name="TE E10", start_date=date.today(), dry_hire=True, description="dryhire today"
|
||||
),
|
||||
11: models.Event.objects.create(
|
||||
name="TE E11",
|
||||
start_date=date.today(),
|
||||
dry_hire=True,
|
||||
checked_in_by=admin_user,
|
||||
description="dryhire today, checked in",
|
||||
),
|
||||
12: models.Event.objects.create(
|
||||
name="TE E12",
|
||||
start_date=date.today() - timedelta(days=1),
|
||||
dry_hire=True,
|
||||
status=models.Event.BOOKED,
|
||||
description="dryhire past",
|
||||
),
|
||||
13: models.Event.objects.create(
|
||||
name="TE E13",
|
||||
start_date=date.today() - timedelta(days=2),
|
||||
dry_hire=True,
|
||||
checked_in_by=admin_user,
|
||||
description="dryhire past checked in",
|
||||
),
|
||||
14: models.Event.objects.create(
|
||||
name="TE E14",
|
||||
start_date=date.today(),
|
||||
dry_hire=True,
|
||||
status=models.Event.CANCELLED,
|
||||
description="dryhire today cancelled",
|
||||
),
|
||||
# 4 non rig - 3 current
|
||||
15: models.Event.objects.create(name="TE E15", start_date=date.today(), is_rig=False,
|
||||
description="non rig today"),
|
||||
16: models.Event.objects.create(name="TE E16", start_date=date.today() + timedelta(days=1), is_rig=False,
|
||||
description="non rig tomorrow"),
|
||||
17: models.Event.objects.create(name="TE E17", start_date=date.today() - timedelta(days=1), is_rig=False,
|
||||
description="non rig yesterday"),
|
||||
18: models.Event.objects.create(name="TE E18", start_date=date.today(), is_rig=False,
|
||||
status=models.Event.CANCELLED,
|
||||
description="non rig today cancelled"),
|
||||
15: models.Event.objects.create(
|
||||
name="TE E15", start_date=date.today(), is_rig=False, description="non rig today"
|
||||
),
|
||||
16: models.Event.objects.create(
|
||||
name="TE E16", start_date=date.today() + timedelta(days=1), is_rig=False, description="non rig tomorrow"
|
||||
),
|
||||
17: models.Event.objects.create(
|
||||
name="TE E17", start_date=date.today() - timedelta(days=1), is_rig=False, description="non rig yesterday"
|
||||
),
|
||||
18: models.Event.objects.create(
|
||||
name="TE E18",
|
||||
start_date=date.today(),
|
||||
is_rig=False,
|
||||
status=models.Event.CANCELLED,
|
||||
description="non rig today cancelled",
|
||||
),
|
||||
}
|
||||
yield many_events
|
||||
for event in many_events:
|
||||
|
||||
Reference in New Issue
Block a user