Merge branch 'master' into web-client

* master: (266 commits)
  Use uv (#1337)
  fix(tox.ini): pass pre-commit SKIPs into pre-commit call
  fix(.github): skip no-commit-to-branch on cicd workflow
  fix: actually set the error text on each page
  fix: try again to show error message on incidents page
  fix: don't throw DataTables errors
  feat: display errors on pages rather than with browser alerts
  [pre-commit.ci] pre-commit autoupdate (#1336)
  build(deps): bump zope-interface from 7.1.0 to 7.1.1 (#1333)
  build(deps): bump werkzeug from 3.0.4 to 3.0.6 (#1330)
  build(deps): bump mypy-zope from 1.0.7 to 1.0.8 (#1334)
  build(deps): bump hypothesis from 6.115.3 to 6.115.5 (#1332)
  build(deps): bump twisted from 24.7.0 to 24.10.0 (#1331)
  build(deps): bump service-identity from 24.1.0 to 24.2.0 (#1329)
  Bump mypy from 1.9.0 to 1.11.2 (#1273)
  Update CHANGELOG.md
  feat: allow more than 6 tabs per browser session
  Update CHANGELOG.md
  feat: add groupings to "add incident report" dropdown
  docs: update CHANGELOG.md
  ...

# Conflicts:
#	MANIFEST.in
#	requirements/requirements-direct.txt
#	setup.py
#	src/ims/application/_auth.py
#	src/ims/application/_external.py
#	src/ims/application/_klein.py
#	src/ims/application/_main.py
#	src/ims/application/_web.py
#	src/ims/element/_element.py
#	src/ims/element/incident/incident_template/template.xhtml
#	src/ims/element/incident/incidents_template/template.xhtml
#	src/ims/element/incident/report_template/template.xhtml
#	src/ims/element/incident/reports_template/template.xhtml
#	src/ims/element/login/template.xhtml
#	src/ims/element/page/_page.py
#	src/ims/element/static/ims.js
#	src/ims/element/static/incident.js
#	src/ims/element/static/incident_report.js
#	src/ims/element/static/incident_reports.js
#	src/ims/element/static/incidents.js

.coveragerc

@@ -6,9 +6,7 @@ source = ims
 [paths]
 source=
    src/ims
-   .tox/*/lib/python*/site-packages/ims
-   .tox/*/Lib/site-packages/ims
-   .tox/pypy*/site-packages/ims
+   .tox/py*/**/site-packages
 
 [report]
 exclude_lines =

.docker/sample.env

@@ -0,0 +1,9 @@
+# DAEMON_GROUP_ID=1420 # Match your docker group ID for permissions
+# IMS_SERVER_PORT=8080
+# DOCKER_RANGERS_NETWORK=rangers
+# IMS_DB_IMAGE=mariadb:10.5.24
+# IMS_DB_HOST_NAME=ranger_ims_database
+# IMS_DB_DATABASE=ims
+# IMS_DB_PASSWORD=7B33108D-4CD4-41B5-A244-B16F97038860
+# IMS_DB_ROOT_PASSWORD=%
+# IMS_DB_ROOT_PASSWORD=ims-root

.dockerignore

@@ -1,3 +1,4 @@
+/.docker
 /.hypothesis
 /.tox
 /build/

.flake8

@@ -76,6 +76,3 @@ extend-ignore =
 
     # End of list (allows last item to end with trailing ',')
     EOL
-
-# flake8-import-order: local module name space
-application-import-names = ims

.github/dependabot.yml

@@ -9,21 +9,21 @@ updates:
     allow:
       - dependency-type: "all"
     schedule:
-      interval: weekly
+      interval: "weekly"
     open-pull-requests-limit: 10
     labels:
       - "Task"
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: weekly
+      interval: "weekly"
     labels:
       - "Task"
 
   - package-ecosystem: "docker"
     directory: "/"
     schedule:
-      interval: weekly
+      interval: "weekly"
     labels:
       - "Task"

.github/workflows/automerge.yml

@@ -12,14 +12,8 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    if: ${{ github.actor == 'dependabot[bot]' }}
+    if: ${{ contains('["dependabot[bot]", "pre-commit-ci[bot]"]', github.actor) }}
     steps:
-      # - name: Get Dependabot metadata
-      #   id: dependabot-metadata
-      #   uses: dependabot/fetch-metadata@v1.6.0
-      #   with:
-      #     github-token: "${{ secrets.GITHUB_TOKEN }}"
-
       - name: Approve the PR
         run: gh pr review --approve "${{ github.event.pull_request.html_url }}"
         env: