mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-09 14:05:33 +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:
@@ -9,7 +9,7 @@ from assets import models as amodels
|
||||
|
||||
|
||||
def create_events(admin_user):
|
||||
models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
|
||||
models.VatRate.objects.create(start_at="2014-03-05", rate=0.20, comment="test1")
|
||||
|
||||
events = {}
|
||||
|
||||
@@ -19,7 +19,7 @@ def create_events(admin_user):
|
||||
|
||||
with reversion.create_revision():
|
||||
reversion.set_user(admin_user)
|
||||
events[2] = models.Event.objects.create(name="TE E2", start_date='2014-03-05')
|
||||
events[2] = models.Event.objects.create(name="TE E2", start_date="2014-03-05")
|
||||
|
||||
with reversion.create_revision():
|
||||
reversion.set_user(admin_user)
|
||||
@@ -38,13 +38,15 @@ def create_assets(admin_user):
|
||||
|
||||
with reversion.create_revision():
|
||||
reversion.set_user(admin_user)
|
||||
assets[1] = amodels.Asset.objects.create(asset_id="1991", description="Spaceflower", status=broken,
|
||||
category=lighting, date_acquired=date.today())
|
||||
assets[1] = amodels.Asset.objects.create(
|
||||
asset_id="1991", description="Spaceflower", status=broken, category=lighting, date_acquired=date.today()
|
||||
)
|
||||
|
||||
with reversion.create_revision():
|
||||
reversion.set_user(admin_user)
|
||||
assets[2] = amodels.Asset.objects.create(asset_id="0001", description="Virgil", status=working,
|
||||
category=lighting, date_acquired=date.today())
|
||||
assets[2] = amodels.Asset.objects.create(
|
||||
asset_id="0001", description="Virgil", status=working, category=lighting, date_acquired=date.today()
|
||||
)
|
||||
|
||||
with reversion.create_revision():
|
||||
reversion.set_user(admin_user)
|
||||
@@ -56,27 +58,27 @@ def create_assets(admin_user):
|
||||
|
||||
def test_history_loads_successfully(admin_client, admin_user):
|
||||
events = create_events(admin_user)
|
||||
request_url = reverse('event_history', kwargs={'pk': events[1].pk})
|
||||
request_url = reverse("event_history", kwargs={"pk": events[1].pk})
|
||||
response = admin_client.get(request_url, follow=True)
|
||||
assert response.status_code == 200
|
||||
assets = create_assets(admin_user)
|
||||
request_url = reverse('asset_history', kwargs={'pk': assets[1].asset_id})
|
||||
request_url = reverse("asset_history", kwargs={"pk": assets[1].asset_id})
|
||||
response = admin_client.get(request_url, follow=True)
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
def test_activity_feed_loads_successfully(admin_client):
|
||||
request_url = reverse('activity_feed')
|
||||
request_url = reverse("activity_feed")
|
||||
response = admin_client.get(request_url, follow=True)
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
def test_activity_table_loads_successfully(admin_client):
|
||||
request_url = reverse('activity_table')
|
||||
request_url = reverse("activity_table")
|
||||
response = admin_client.get(request_url, follow=True)
|
||||
assert response.status_code == 200
|
||||
|
||||
request_url = reverse('assets_activity_table')
|
||||
request_url = reverse("assets_activity_table")
|
||||
response = admin_client.get(request_url, follow=True)
|
||||
assert response.status_code == 200
|
||||
|
||||
@@ -84,7 +86,7 @@ def test_activity_table_loads_successfully(admin_client):
|
||||
# Some edge cases that have caused server errors in the past
|
||||
def test_deleted_event(admin_client, admin_user):
|
||||
events = create_events(admin_user)
|
||||
request_url = reverse('activity_feed')
|
||||
request_url = reverse("activity_feed")
|
||||
|
||||
events[2].delete()
|
||||
|
||||
@@ -95,7 +97,7 @@ def test_deleted_event(admin_client, admin_user):
|
||||
|
||||
def test_deleted_relation(admin_client, admin_user):
|
||||
events = create_events(admin_user)
|
||||
request_url = reverse('activity_feed')
|
||||
request_url = reverse("activity_feed")
|
||||
|
||||
with reversion.create_revision():
|
||||
person = models.Person.objects.create(name="Test Person")
|
||||
|
||||
Reference in New Issue
Block a user