mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-07 04:55:29 +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,17 +1,14 @@
|
||||
import datetime
|
||||
import random
|
||||
|
||||
from django.contrib.auth.models import Group, Permission
|
||||
from django.core.management.base import BaseCommand, CommandError
|
||||
from django.db import transaction
|
||||
from django.utils import timezone
|
||||
from reversion import revisions as reversion
|
||||
|
||||
from RIGS import models
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = 'Adds sample data to use for testing'
|
||||
help = "Adds sample data to use for testing"
|
||||
can_import_settings = True
|
||||
|
||||
profiles = []
|
||||
@@ -24,10 +21,11 @@ class Command(BaseCommand):
|
||||
from django.conf import settings
|
||||
|
||||
if not (settings.DEBUG or settings.STAGING):
|
||||
raise CommandError('You cannot run this command in production')
|
||||
raise CommandError("You cannot run this command in production")
|
||||
|
||||
random.seed(
|
||||
'Some object to seed the random number generator') # otherwise it is done by time, which could lead to inconsistent tests
|
||||
"Some object to seed the random number generator"
|
||||
) # otherwise it is done by time, which could lead to inconsistent tests
|
||||
|
||||
with transaction.atomic():
|
||||
self.setup_groups()
|
||||
@@ -36,23 +34,53 @@ class Command(BaseCommand):
|
||||
print("Done generating sample user data")
|
||||
|
||||
def setup_groups(self):
|
||||
self.keyholder_group = Group.objects.create(name='Keyholders')
|
||||
self.finance_group = Group.objects.create(name='Finance')
|
||||
self.hs_group = Group.objects.create(name='H&S')
|
||||
self.keyholder_group = Group.objects.create(name="Keyholders")
|
||||
self.finance_group = Group.objects.create(name="Finance")
|
||||
self.hs_group = Group.objects.create(name="H&S")
|
||||
|
||||
keyholder_perms = ["add_event", "change_event", "view_event",
|
||||
"add_eventitem", "change_eventitem", "delete_eventitem",
|
||||
"add_organisation", "change_organisation", "view_organisation",
|
||||
"add_person", "change_person", "view_person", "view_profile",
|
||||
"add_venue", "change_venue", "view_venue",
|
||||
"add_asset", "change_asset", "delete_asset",
|
||||
"view_asset", "view_supplier", "change_supplier", "asset_finance",
|
||||
"add_supplier", "view_cabletype", "change_cabletype",
|
||||
"add_cabletype", "view_eventchecklist", "change_eventchecklist",
|
||||
"add_eventchecklist", "view_riskassessment", "change_riskassessment",
|
||||
"add_riskassessment"]
|
||||
finance_perms = keyholder_perms + ["add_invoice", "change_invoice", "view_invoice",
|
||||
"add_payment", "change_payment", "delete_payment"]
|
||||
keyholder_perms = [
|
||||
"add_event",
|
||||
"change_event",
|
||||
"view_event",
|
||||
"add_eventitem",
|
||||
"change_eventitem",
|
||||
"delete_eventitem",
|
||||
"add_organisation",
|
||||
"change_organisation",
|
||||
"view_organisation",
|
||||
"add_person",
|
||||
"change_person",
|
||||
"view_person",
|
||||
"view_profile",
|
||||
"add_venue",
|
||||
"change_venue",
|
||||
"view_venue",
|
||||
"add_asset",
|
||||
"change_asset",
|
||||
"delete_asset",
|
||||
"view_asset",
|
||||
"view_supplier",
|
||||
"change_supplier",
|
||||
"asset_finance",
|
||||
"add_supplier",
|
||||
"view_cabletype",
|
||||
"change_cabletype",
|
||||
"add_cabletype",
|
||||
"view_eventchecklist",
|
||||
"change_eventchecklist",
|
||||
"add_eventchecklist",
|
||||
"view_riskassessment",
|
||||
"change_riskassessment",
|
||||
"add_riskassessment",
|
||||
]
|
||||
finance_perms = keyholder_perms + [
|
||||
"add_invoice",
|
||||
"change_invoice",
|
||||
"view_invoice",
|
||||
"add_payment",
|
||||
"change_payment",
|
||||
"delete_payment",
|
||||
]
|
||||
hs_perms = keyholder_perms + ["review_riskassessment", "review_eventchecklist"]
|
||||
|
||||
for permId in keyholder_perms:
|
||||
@@ -68,13 +96,25 @@ class Command(BaseCommand):
|
||||
self.hs_group.save()
|
||||
|
||||
def setup_generic_profiles(self):
|
||||
names = ["Clara Oswin Oswald", "Rory Williams", "Amy Pond", "River Song", "Martha Jones", "Donna Noble",
|
||||
"Jack Harkness", "Mickey Smith", "Rose Tyler"]
|
||||
names = [
|
||||
"Clara Oswin Oswald",
|
||||
"Rory Williams",
|
||||
"Amy Pond",
|
||||
"River Song",
|
||||
"Martha Jones",
|
||||
"Donna Noble",
|
||||
"Jack Harkness",
|
||||
"Mickey Smith",
|
||||
"Rose Tyler",
|
||||
]
|
||||
for i, name in enumerate(names):
|
||||
new_profile = models.Profile.objects.create(username=name.replace(" ", ""), first_name=name.split(" ")[0],
|
||||
last_name=name.split(" ")[-1],
|
||||
email=name.replace(" ", "") + "@example.com",
|
||||
initials="".join([j[0].upper() for j in name.split()]))
|
||||
new_profile = models.Profile.objects.create(
|
||||
username=name.replace(" ", ""),
|
||||
first_name=name.split(" ")[0],
|
||||
last_name=name.split(" ")[-1],
|
||||
email=name.replace(" ", "") + "@example.com",
|
||||
initials="".join([j[0].upper() for j in name.split()]),
|
||||
)
|
||||
if i % 2 == 0:
|
||||
new_profile.phone = "01234 567894"
|
||||
|
||||
@@ -82,32 +122,65 @@ class Command(BaseCommand):
|
||||
self.profiles.append(new_profile)
|
||||
|
||||
def setup_useful_profiles(self):
|
||||
super_user = models.Profile.objects.create_superuser(username="superuser",
|
||||
email="superuser@example.com", password="superuser", first_name="Super", last_name="User",
|
||||
initials="SU", is_active=True)
|
||||
super_user = models.Profile.objects.create_superuser(
|
||||
username="superuser",
|
||||
email="superuser@example.com",
|
||||
password="superuser",
|
||||
first_name="Super",
|
||||
last_name="User",
|
||||
initials="SU",
|
||||
is_active=True,
|
||||
)
|
||||
super_user.save()
|
||||
|
||||
finance_user = models.Profile.objects.create_user(username="finance",
|
||||
email="financeuser@example.com", password="finance", first_name="Finance", last_name="User",
|
||||
initials="FU", is_active=True, is_approved=True)
|
||||
finance_user = models.Profile.objects.create_user(
|
||||
username="finance",
|
||||
email="financeuser@example.com",
|
||||
password="finance",
|
||||
first_name="Finance",
|
||||
last_name="User",
|
||||
initials="FU",
|
||||
is_active=True,
|
||||
is_approved=True,
|
||||
)
|
||||
finance_user.groups.add(self.finance_group)
|
||||
finance_user.groups.add(self.keyholder_group)
|
||||
finance_user.save()
|
||||
|
||||
hs_user = models.Profile.objects.create_user(username="hs",
|
||||
email="hsuser@example.com", password="hs", first_name="HS", last_name="User",
|
||||
initials="HSU", is_active=True, is_approved=True)
|
||||
hs_user = models.Profile.objects.create_user(
|
||||
username="hs",
|
||||
email="hsuser@example.com",
|
||||
password="hs",
|
||||
first_name="HS",
|
||||
last_name="User",
|
||||
initials="HSU",
|
||||
is_active=True,
|
||||
is_approved=True,
|
||||
)
|
||||
hs_user.groups.add(self.hs_group)
|
||||
hs_user.groups.add(self.keyholder_group)
|
||||
hs_user.save()
|
||||
|
||||
keyholder_user = models.Profile.objects.create_user(username="keyholder",
|
||||
email="keyholderuser@example.com", password="keyholder", first_name="Keyholder", last_name="User",
|
||||
initials="KU", is_active=True,
|
||||
is_approved=True)
|
||||
keyholder_user = models.Profile.objects.create_user(
|
||||
username="keyholder",
|
||||
email="keyholderuser@example.com",
|
||||
password="keyholder",
|
||||
first_name="Keyholder",
|
||||
last_name="User",
|
||||
initials="KU",
|
||||
is_active=True,
|
||||
is_approved=True,
|
||||
)
|
||||
keyholder_user.groups.add(self.keyholder_group)
|
||||
keyholder_user.save()
|
||||
|
||||
basic_user = models.Profile.objects.create_user(username="basic",
|
||||
email="basicuser@example.com", password="basic", first_name="Basic", last_name="User",
|
||||
initials="BU", is_active=True, is_approved=True)
|
||||
models.Profile.objects.create_user(
|
||||
username="basic",
|
||||
email="basicuser@example.com",
|
||||
password="basic",
|
||||
first_name="Basic",
|
||||
last_name="User",
|
||||
initials="BU",
|
||||
is_active=True,
|
||||
is_approved=True,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user