mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-09 05:55:36 +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,18 +1,13 @@
|
||||
import datetime
|
||||
import random
|
||||
|
||||
from django.contrib.auth.models import Group, Permission
|
||||
from django.core.management import call_command
|
||||
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 training 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
|
||||
|
||||
categories = []
|
||||
@@ -24,9 +19,9 @@ 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('otherwise it is done by time, which could lead to inconsistant tests')
|
||||
random.seed("otherwise it is done by time, which could lead to inconsistant tests")
|
||||
|
||||
with transaction.atomic():
|
||||
self.setup_categories()
|
||||
@@ -141,7 +136,8 @@ class Command(BaseCommand):
|
||||
"Losing Crimpaz",
|
||||
"Scrapping Trilite",
|
||||
"Bin Diving",
|
||||
"Wiki Editing"]
|
||||
"Wiki Editing",
|
||||
]
|
||||
|
||||
descriptions = [
|
||||
"Physical training concentrates on mechanistic goals: training programs in this area develop specific motor skills, agility, strength or physical fitness, often with an intention of peaking at a particular time.",
|
||||
@@ -149,7 +145,7 @@ class Command(BaseCommand):
|
||||
"These include how to use a variety of weapons, outdoor survival skills, and how to survive being captured by the enemy, among many others. See military education and training.",
|
||||
"While some studies have indicated relaxation training is useful for some medical conditions, autogenic training has limited results or has been the result of few studies.",
|
||||
"Some occupations are inherently hazardous, and require a minimum level of competence before the practitioners can perform the work at an acceptable level of safety to themselves or others in the vicinity.",
|
||||
"Occupational diving, rescue, firefighting and operation of certain types of machinery and vehicles may require assessment and certification of a minimum acceptable competence before the person is allowed to practice as a licensed instructor."
|
||||
"Occupational diving, rescue, firefighting and operation of certain types of machinery and vehicles may require assessment and certification of a minimum acceptable competence before the person is allowed to practice as a licensed instructor.",
|
||||
]
|
||||
|
||||
for i, name in enumerate(names):
|
||||
@@ -159,7 +155,12 @@ class Command(BaseCommand):
|
||||
number = previous_item.reference_number + 1
|
||||
else:
|
||||
number = 0
|
||||
item = models.TrainingItem.objects.create(category=category, reference_number=number, name=name, description=random.choice(descriptions) + random.choice(descriptions) + random.choice(descriptions))
|
||||
item = models.TrainingItem.objects.create(
|
||||
category=category,
|
||||
reference_number=number,
|
||||
name=name,
|
||||
description=random.choice(descriptions) + random.choice(descriptions) + random.choice(descriptions),
|
||||
)
|
||||
self.items.append(item)
|
||||
|
||||
def setup_levels(self):
|
||||
@@ -167,34 +168,54 @@ class Command(BaseCommand):
|
||||
ta = models.TrainingLevel.objects.create(
|
||||
level=models.TrainingLevel.TA,
|
||||
description="Passion will hatred faithful evil suicide noble battle. Truth aversion gains grandeur noble. Dead play gains prejudice god ascetic grandeur zarathustra dead good. Faithful ultimate justice overcome love will mountains inexpedient.",
|
||||
icon="address-card")
|
||||
icon="address-card",
|
||||
)
|
||||
self.levels.append(ta)
|
||||
tech_ccs = models.TrainingLevel.objects.create(
|
||||
level=models.TrainingLevel.TECHNICIAN,
|
||||
description="Technician Common Competencies. Spirit abstract endless insofar horror sexuality depths war decrepit against strong aversion revaluation free. Christianity reason joy sea law mountains transvaluation. Sea battle aversion dead ultimate morality self. Faithful morality.",
|
||||
icon="book-reader")
|
||||
icon="book-reader",
|
||||
)
|
||||
tech_ccs.prerequisite_levels.add(ta)
|
||||
super_ccs = models.TrainingLevel.objects.create(level=models.TrainingLevel.SUPERVISOR, description="Depths disgust hope faith of against hatred will victorious. Law...", icon="user-graduate")
|
||||
super_ccs = models.TrainingLevel.objects.create(
|
||||
level=models.TrainingLevel.SUPERVISOR,
|
||||
description="Depths disgust hope faith of against hatred will victorious. Law...",
|
||||
icon="user-graduate",
|
||||
)
|
||||
for i in range(0, 5):
|
||||
if len(items) == 0:
|
||||
break
|
||||
item = random.choice(items)
|
||||
items.remove(item)
|
||||
if i % 3 == 0:
|
||||
models.TrainingLevelRequirement.objects.create(level=tech_ccs, item=item, depth=random.choice(models.TrainingItemQualification.CHOICES)[0])
|
||||
models.TrainingLevelRequirement.objects.create(
|
||||
level=tech_ccs, item=item, depth=random.choice(models.TrainingItemQualification.CHOICES)[0]
|
||||
)
|
||||
else:
|
||||
models.TrainingLevelRequirement.objects.create(level=super_ccs, item=item, depth=random.choice(models.TrainingItemQualification.CHOICES)[0])
|
||||
models.TrainingLevelRequirement.objects.create(
|
||||
level=super_ccs, item=item, depth=random.choice(models.TrainingItemQualification.CHOICES)[0]
|
||||
)
|
||||
icons = {
|
||||
models.TrainingLevel.SOUND: ('microphone', 'microphone-alt'),
|
||||
models.TrainingLevel.LIGHTING: ('lightbulb', 'traffic-light'),
|
||||
models.TrainingLevel.POWER: ('plug', 'bolt'),
|
||||
models.TrainingLevel.RIGGING: ('link', 'pallet'),
|
||||
models.TrainingLevel.HAULAGE: ('truck', 'route'),
|
||||
models.TrainingLevel.SOUND: ("microphone", "microphone-alt"),
|
||||
models.TrainingLevel.LIGHTING: ("lightbulb", "traffic-light"),
|
||||
models.TrainingLevel.POWER: ("plug", "bolt"),
|
||||
models.TrainingLevel.RIGGING: ("link", "pallet"),
|
||||
models.TrainingLevel.HAULAGE: ("truck", "route"),
|
||||
}
|
||||
for i, name in models.TrainingLevel.DEPARTMENTS:
|
||||
technician = models.TrainingLevel.objects.create(level=models.TrainingLevel.TECHNICIAN, department=i, description="Moral pinnacle derive ultimate war dead. Strong fearful joy contradict battle christian faithful enlightenment prejudice zarathustra moral.", icon=icons[i][0])
|
||||
technician = models.TrainingLevel.objects.create(
|
||||
level=models.TrainingLevel.TECHNICIAN,
|
||||
department=i,
|
||||
description="Moral pinnacle derive ultimate war dead. Strong fearful joy contradict battle christian faithful enlightenment prejudice zarathustra moral.",
|
||||
icon=icons[i][0],
|
||||
)
|
||||
technician.prerequisite_levels.add(tech_ccs)
|
||||
supervisor = models.TrainingLevel.objects.create(level=models.TrainingLevel.SUPERVISOR, department=i, description="Spirit holiest merciful mountains inexpedient reason value. Suicide ultimate hope.", icon=icons[i][1])
|
||||
supervisor = models.TrainingLevel.objects.create(
|
||||
level=models.TrainingLevel.SUPERVISOR,
|
||||
department=i,
|
||||
description="Spirit holiest merciful mountains inexpedient reason value. Suicide ultimate hope.",
|
||||
icon=icons[i][1],
|
||||
)
|
||||
supervisor.prerequisite_levels.add(super_ccs, technician)
|
||||
|
||||
for i in range(0, 30):
|
||||
@@ -204,9 +225,17 @@ class Command(BaseCommand):
|
||||
items.remove(item)
|
||||
try:
|
||||
if i % 3 == 0:
|
||||
models.TrainingLevelRequirement.objects.create(level=technician, item=item, depth=random.choice(models.TrainingItemQualification.CHOICES)[0])
|
||||
models.TrainingLevelRequirement.objects.create(
|
||||
level=technician,
|
||||
item=item,
|
||||
depth=random.choice(models.TrainingItemQualification.CHOICES)[0],
|
||||
)
|
||||
else:
|
||||
models.TrainingLevelRequirement.objects.create(level=supervisor, item=item, depth=random.choice(models.TrainingItemQualification.CHOICES)[0])
|
||||
models.TrainingLevelRequirement.objects.create(
|
||||
level=supervisor,
|
||||
item=item,
|
||||
depth=random.choice(models.TrainingItemQualification.CHOICES)[0],
|
||||
)
|
||||
except: # noqa
|
||||
print("Failed create for {}. Weird.".format(item))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user