8000 Merge upstream shapiromatron/hawc main (Oct 2026) by shanethacker · Pull Request #7 · USEPA/hawc · GitHub
[go: up one dir, main page]

Skip to content

Merge upstream shapiromatron/hawc main (Oct 2026) - #7

Draft
shanethacker wants to merge 88 commits into
mainfrom
merge-upstream-2026-10
Draft

shanethacker wants to merge 88 commits into
mainfrom
merge-upstream-2026-10

Conversation

@shanethacker
Copy link
Copy Markdown
Collaborator

Brings USEPA/hawc up to date with upstream, including: Wagtail CMS removal, granian replacing gunicorn, Python 3.14, drf-spectacular, cloud media storage option, and dependency updates. Resolved conflicts in .gitignore, version strings, and pyproject dependencies.

shapiromatron and others added 30 commits November 18, 2025 22:23
* fix regression in more flexible imports

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* update test - use commas, tabs, newlines in import string

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* version bump

* update format from ruff

* update plotly version

* update vite

* fix suspicious	operation errors

* update JS dependencies

* update actions

* Revert "update actions"

This reverts commit 43cff823b481779e24315c1a04dcc3eed47ec027.

* Revert "update JS dependencies"

This reverts commit a01dbb5ef6a5fc062947229aaeb6f9ef2124e74b.

* Revert "update vite"

This reverts commit 3decd9c1c15b488ee8530f918670b64f7b2242be.
* update gh-actions

* undo postgres version update
* update plotly

* update vite

* fix build location

* update other JS packages

* update biome version

* Revert "update biome version"

This reverts commit c5576358e316c9d22dba09d696db19e336fc068f.

* Revert "update other JS packages"

This reverts commit f90c0a20b875786f5ca42cb3f1313796020dd401.
* update datatables.net

* update d3, mobx, tablesort

* update packages; hold back mobx package a litte

* update mobx, not mobx-react
* remove wait-for script

* wait for healthy services

* update healthcheck numbers

* remove deprecated version number
Bumps the actions-deps group with 2 updates: [actions/upload-artifact](https://github.com/actions/upload-artifact) and [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/upload-artifact` from 4 to 5
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v4...v5)

Updates `actions/download-artifact` from 4 to 6
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v4...v6)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions-deps
- dependency-name: actions/download-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump the py-deps group across 1 directory with 12 updates

Updates the requirements on [django-filter](https://github.com/carltongibson/django-filter), [wagtail](https://github.com/wagtail/wagtail), [wagtail-draftail-anchors](https://github.com/wagtail-nest/wagtail_draftail_anchors), [kombu](https://github.com/celery/kombu), [redis](https://github.com/redis/redis-py), [tinycss2](https://github.com/Kozea/tinycss2), [poethepoet](https://github.com/nat-n/poethepoet), [ruff](https://github.com/astral-sh/ruff), [pre-commit](https://github.com/pre-commit/pre-commit), [pytest](https://github.com/pytest-dev/pytest), [mkdocs-material](https://github.com/squidfunk/mkdocs-material) and [sentry-sdk](https://github.com/getsentry/sentry-python) to permit the latest version.

Updates `django-filter` from 24.3 to 25.2
- [Release notes](https://github.com/carltongibson/django-filter/releases)
- [Changelog](https://github.com/carltongibson/django-filter/blob/main/CHANGES.rst)
- [Commits](carltongibson/django-filter@24.3...25.2)

Updates `wagtail` to 7.2
- [Release notes](https://github.com/wagtail/wagtail/releases)
- [Changelog](https://github.com/wagtail/wagtail/blob/main/CHANGELOG.txt)
- [Commits](wagtail/wagtail@v7.1.1...v7.2)

Updates `wagtail-draftail-anchors` from 0.6.2 to 0.7.0
- [Changelog](https://github.com/wagtail-nest/wagtail_draftail_anchors/blob/main/CHANGELOG.txt)
- [Commits](https://github.com/wagtail-nest/wagtail_draftail_anchors/commits)

Updates `kombu` from 5.5.4 to 5.6.0
- [Release notes](https://github.com/celery/kombu/releases)
- [Changelog](https://github.com/celery/kombu/blob/main/Changelog.rst)
- [Commits](celery/kombu@v5.5.4...v5.6.0)

Updates `redis` from 7.0.1 to 7.1.0
- [Release notes](https://github.com/redis/redis-py/releases)
- [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES)
- [Commits](redis/redis-py@v7.0.1...v7.1.0)

Updates `tinycss2` from 1.4.0 to 1.5.1
- [Release notes](https://github.com/Kozea/tinycss2/releases)
- [Changelog](https://github.com/Kozea/tinycss2/blob/main/docs/changelog.rst)
- [Commits](Kozea/tinycss2@v1.4.0...v1.5.1)

Updates `poethepoet` to 0.38.0
- [Release notes](https://github.com/nat-n/poethepoet/releases)
- [Commits](nat-n/poethepoet@v0.37.0...v0.38.0)

Updates `ruff` from 0.14.5 to 0.14.6
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.14.5...0.14.6)

Updates `pre-commit` from 4.4.0 to 4.5.0
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](pre-commit/pre-commit@v4.4.0...v4.5.0)

Updates `pytest` to 9.0.1
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.4.2...9.0.1)

Updates `mkdocs-material` to 9.7.0
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](squidfunk/mkdocs-material@9.6.14...9.7.0)

Updates `sentry-sdk` to 2.46.0
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](getsentry/sentry-python@2.45.0...2.46.0)

---
updated-dependencies:
- dependency-name: django-filter
  dependency-version: '25.2'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: py-deps
- dependency-name: wagtail
  dependency-version: '7.2'
  dependency-type: direct:production
  dependency-group: py-deps
- dependency-name: wagtail-draftail-anchors
  dependency-version: 0.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: py-deps
- dependency-name: kombu
  dependency-version: 5.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: py-deps
- dependency-name: redis
  dependency-version: 7.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: py-deps
- dependency-name: tinycss2
  dependency-version: 1.5.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: py-deps
- dependency-name: poethepoet
  dependency-version: 0.38.0
  dependency-type: direct:development
  dependency-group: py-deps
- dependency-name: ruff
  dependency-version: 0.14.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: py-deps
- dependency-name: pre-commit
  dependency-version: 4.5.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: py-deps
- dependency-name: pytest
  dependency-version: 9.0.1
  dependency-type: direct:development
  dependency-group: py-deps
- dependency-name: mkdocs-material
  dependency-version: 9.7.0
  dependency-type: direct:development
  dependency-group: py-deps
- dependency-name: sentry-sdk
  dependency-version: 2.46.0
  dependency-type: direct:development
  dependency-group: py-deps
...

Signed-off-by: dependabot[bot] <support@github.com>

* updates

* kombu

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
* Initial plan

* Add tests for forms.py - improved coverage to 94.7%

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Fix linting issues in test files

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* updates from review

* tests from review

* add epiv2 api

* remove extra healthcheck info

* remove unused methods

* boost coverage for epimeta

* add more tests

* remove unused code

* fix

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
* Initial plan

* Add drf-spectacular and configure basic settings

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Update test to verify schema format

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Remove unused schema.py file

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* version bump and fix test

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
* update Python from version 3.13 to 3.14

* remove uv integration with poe
* remove assessment.Job model

* delete old jobs from cron
* Initial plan

* Replace flit with uv build for package building

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Update documentation to reflect uv build instead of flit

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* fix

* updates

* updates

* again

* pull version for package metadata

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
Bumps the actions-deps group with 2 updates: [actions/upload-artifact](https://github.com/actions/upload-artifact) and [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/upload-artifact` from 5 to 6
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v5...v6)

Updates `actions/download-artifact` from 6 to 7
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v6...v7)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions-deps
- dependency-name: actions/download-artifact
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the js-deps group in /frontend with 10 updates:

| Package | From | To |
| --- | --- | --- |
| [d3-cloud](https://github.com/jasondavies/d3-cloud) | `1.2.7` | `1.2.8` |
| [datatables.net](https://github.com/DataTables/Dist-DataTables) | `2.3.5` | `2.3.6` |
| [plotly.js](https://github.com/plotly/plotly.js) | `3.3.0` | `3.3.1` |
| [tablesort](https://github.com/tristen/tablesort) | `5.6.0` | `5.7.0` |
| [@biomejs/biome](https://github.com/biomejs/biome/tree/HEAD/packages/@biomejs/biome) | `2.3.7` | `2.3.11` |
| [@testing-library/react](https://github.com/testing-library/react-testing-library) | `16.3.0` | `16.3.1` |
| [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/tree/HEAD/packages/plugin-react) | `5.1.1` | `5.1.2` |
| [jsdom](https://github.com/jsdom/jsdom) | `27.2.0` | `27.4.0` |
| [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) | `7.2.4` | `7.3.0` |
| [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) | `4.0.13` | `4.0.16` |


Updates `d3-cloud` from 1.2.7 to 1.2.8
- [Commits](https://github.com/jasondavies/d3-cloud/commits)

Updates `datatables.net` from 2.3.5 to 2.3.6
- [Release notes](https://github.com/DataTables/Dist-DataTables/releases)
- [Commits](DataTables/Dist-DataTables@2.3.5...2.3.6)

Updates `plotly.js` from 3.3.0 to 3.3.1
- [Release notes](https://github.com/plotly/plotly.js/releases)
- [Changelog](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md)
- [Commits](plotly/plotly.js@v3.3.0...v3.3.1)

Updates `tablesort` from 5.6.0 to 5.7.0
- [Release notes](https://github.com/tristen/tablesort/releases)
- [Commits](tristen/tablesort@5.6.0...5.7.0)

Updates `@biomejs/biome` from 2.3.7 to 2.3.11
- [Release notes](https://github.com/biomejs/biome/releases)
- [Changelog](https://github.com/biomejs/biome/blob/main/packages/@biomejs/biome/CHANGELOG.md)
- [Commits](https://github.com/biomejs/biome/commits/@biomejs/biome@2.3.11/packages/@biomejs/biome)

Updates `@testing-library/react` from 16.3.0 to 16.3.1
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md)
- [Commits](testing-library/react-testing-library@v16.3.0...v16.3.1)

Updates `@vitejs/plugin-react` from 5.1.1 to 5.1.2
- [Release notes](https://github.com/vitejs/vite-plugin-react/releases)
- [Changelog](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite-plugin-react/commits/plugin-react@5.1.2/packages/plugin-react)

Updates `jsdom` from 27.2.0 to 27.4.0
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Changelog](https://github.com/jsdom/jsdom/blob/main/Changelog.md)
- [Commits](jsdom/jsdom@27.2.0...27.4.0)

Updates `vite` from 7.2.4 to 7.3.0
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v7.3.0/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v7.3.0/packages/vite)

Updates `vitest` from 4.0.13 to 4.0.16
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v4.0.16/packages/vitest)

---
updated-dependencies:
- dependency-name: d3-cloud
  dependency-version: 1.2.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: js-deps
- dependency-name: datatables.net
  dependency-version: 2.3.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: js-deps
- dependency-name: plotly.js
  dependency-version: 3.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: js-deps
- dependency-name: tablesort
  dependency-version: 5.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: js-deps
- dependency-name: "@biomejs/biome"
  dependency-version: 2.3.11
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: js-deps
- dependency-name: "@testing-library/react"
  dependency-version: 16.3.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: js-deps
- dependency-name: "@vitejs/plugin-react"
  dependency-version: 5.1.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: js-deps
- dependency-name: jsdom
  dependency-version: 27.4.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: js-deps
- dependency-name: vite
  dependency-version: 7.3.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: js-deps
- dependency-name: vitest
  dependency-version: 4.0.16
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: js-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump the py-deps group across 1 directory with 10 updates

Updates the requirements on [django-reversion](https://github.com/etianen/django-reversion), [django-treebeard](https://github.com/django-treebeard/django-treebeard), [celery](https://github.com/celery/celery), [billiard](https://github.com/celery/billiard), [kombu](https://github.com/celery/kombu), [ruff](https://github.com/astral-sh/ruff), [coverage](https://github.com/coveragepy/coveragepy), [vcrpy](https://github.com/kevin1024/vcrpy), [django-anymail](https://github.com/anymail/django-anymail) and [sentry-sdk](https://github.com/getsentry/sentry-python) to permit the latest version.

Updates `django-reversion` from 6.0.0 to 6.1.0
- [Release notes](https://github.com/etianen/django-reversion/releases)
- [Changelog](https://github.com/etianen/django-reversion/blob/master/CHANGELOG.rst)
- [Commits](etianen/django-reversion@v6.0.0...v6.1.0)

Updates `django-treebeard` from 4.7.1 to 4.8.0
- [Changelog](https://github.com/django-treebeard/django-treebeard/blob/master/CHANGES.md)
- [Commits](django-treebeard/django-treebeard@4.7.1...4.8.0)

Updates `celery` from 5.5.3 to 5.6.2
- [Release notes](https://github.com/celery/celery/releases)
- [Changelog](https://github.com/celery/celery/blob/main/Changelog.rst)
- [Commits](celery/celery@v5.5.3...v5.6.2)

Updates `billiard` from 4.2.3 to 4.2.4
- [Release notes](https://github.com/celery/billiard/releases)
- [Changelog](https://github.com/celery/billiard/bl
8000
ob/main/CHANGES.txt)
- [Commits](celery/billiard@v4.2.3...v4.2.4)

Updates `kombu` from 5.5.4 to 5.6.2
- [Release notes](https://github.com/celery/kombu/releases)
- [Changelog](https://github.com/celery/kombu/blob/main/Changelog.rst)
- [Commits](celery/kombu@v5.5.4...v5.6.2)

Updates `ruff` from 0.14.6 to 0.14.10
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.14.6...0.14.10)

Updates `coverage` to 7.13.1
- [Release notes](https://github.com/coveragepy/coveragepy/releases)
- [Changelog](https://github.com/coveragepy/coveragepy/blob/main/CHANGES.rst)
- [Commits](coveragepy/coveragepy@7.12.0...7.13.1)

Updates `vcrpy` from 7.0.0 to 8.1.1
- [Release notes](https://github.com/kevin1024/vcrpy/releases)
- [Changelog](https://github.com/kevin1024/vcrpy/blob/master/docs/changelog.rst)
- [Commits](kevin1024/vcrpy@v7.0.0...v8.1.1)

Updates `django-anymail` to 14.0
- [Release notes](https://github.com/anymail/django-anymail/releases)
- [Changelog](https://github.com/anymail/django-anymail/blob/main/CHANGELOG.rst)
- [Commits](anymail/django-anymail@v13.1...v14.0)

Updates `sentry-sdk` to 2.48.0
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](getsentry/sentry-python@2.46.0...2.48.0)

---
updated-dependencies:
- dependency-name: django-reversion
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: py-deps
- dependency-name: django-treebeard
  dependency-version: 4.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: py-deps
- dependency-name: celery
  dependency-version: 5.6.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: py-deps
- dependency-name: billiard
  dependency-version: 4.2.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: py-deps
- dependency-name: kombu
  dependency-version: 5.6.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: py-deps
- dependency-name: ruff
  dependency-version: 0.14.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: py-deps
- dependency-name: coverage
  dependency-version: 7.13.1
  dependency-type: direct:development
  dependency-group: py-deps
- dependency-name: vcrpy
  dependency-version: 8.1.1
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: py-deps
- dependency-name: django-anymail
  dependency-version: '14.0'
  dependency-type: direct:development
  dependency-group: py-deps
- dependency-name: sentry-sdk
  dependency-version: 2.48.0
  dependency-type: direct:development
  dependency-group: py-deps
...

Signed-off-by: dependabot[bot] <support@github.com>

* hold back django

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
* Initial plan

* Remove wagtail and hawc.apps.docs

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Remove TestWagtailAccounts test class

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Remove ENABLE_DOCS_LINK feature flag and fix db.yaml to only show deletions

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* updates

* fix fixture

* fix tests

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
* Initial plan

* Replace gunicorn with granian WSGI server

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Address code review feedback - move granian imports to module level

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Remove run_granian.py management command and restore run_gunicorn.py

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* updates from testing

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
shapiromatron and others added 6 commits June 10, 2026 23:58
* fix dependabot

* update versions

* more updates
Bumps the github-actions-dependencies group with 3 updates: [actions/checkout](https://github.com/actions/checkout), [actions/setup-python](https://github.com/actions/setup-python) and [actions/setup-node](https://github.com/actions/setup-node).


Updates `actions/checkout` from 6 to 7
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v6...v7)

Updates `actions/setup-python` from 6 to 7
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v6...v7)

Updates `actions/setup-node` from 6 to 7
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions-dependencies
- dependency-name: actions/setup-python
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions-dependencies
- dependency-name: actions/setup-node
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@shanethacker
shanethacker marked this pull request as draft October 7, 2026 18:26
shapiromatron and others added 18 commits October 12, 2026 11:09
* only show unresolved on conflict resolution page

* filter by assessment first

* use require resolution method

* remove unused queries

* revise overview info

* add issue on resolution if available

* update filterset methods

* address comments

* fix ci
* run `yarn upgrade`

* update vite

* update vitest

* update test libraries

* update biome

* update plotly

* update mobx version

* remove plotly shim

* update datatables

* updates
Bumps [pillow](https://github.com/python-pillow/Pillow) from 12.3.0 to 13.0.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@12.3.0...13.0.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-version: 13.0.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [certifi](https://github.com/certifi/python-certifi) from 2026.7.22 to 2026.10.19.
- [Commits](certifi/python-certifi@2026.07.22...2026.10.19)

---
updated-dependencies:
- dependency-name: certifi
  dependency-version: 2026.10.19
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* check for numeric inputs

* update

* fix test
Bumps [certifi](https://github.com/certifi/python-certifi) from 2026.10.19 to 2026.10.23.
- [Commits](certifi/python-certifi@2026.10.19...2026.10.23)

---
updated-dependencies:
- dependency-name: certifi
  dependency-version: 2026.10.23
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix tests

* handle concatenated columns

* add tests
* fix animal group clone order

* add comments and type annotations
* template format

* add djade

* revise command

* djade format templates

* add back djhtml

* reduce formatting verbosity
…1355)

* Bump the javascript-dependencies group in /frontend with 6 updates

Bumps the javascript-dependencies group in /frontend with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [mobx](https://github.com/mobxjs/mobx) | `6.16.1` | `7.1.1` |
| [@biomejs/biome](https://github.com/biomejs/biome/tree/HEAD/packages/@biomejs/biome) | `2.5.14` | `2.6.3` |
| [jsdom](https://github.com/jsdom/jsdom) | `30.1.2` | `30.1.3` |
| [peggy](https://github.com/peggyjs/peggy) | `5.1.0` | `5.1.1` |
| [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) | `8.3.4` | `8.3.5` |
| [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) | `5.0.4` | `5.0.5` |


Updates `mobx` from 6.16.1 to 7.1.1
- [Release notes](https://github.com/mobxjs/mobx/releases)
- [Commits](https://github.com/mobxjs/mobx/compare/mobx@6.16.1...mobx@7.1.1)

Updates `@biomejs/biome` from 2.5.14 to 2.6.3
- [Release notes](https://github.com/biomejs/biome/releases)
- [Changelog](https://github.com/biomejs/biome/blob/main/CHANGELOG_v1.md)
- [Commits](https://github.com/biomejs/biome/commits/@biomejs/biome@2.6.3/packages/@biomejs/biome)

Updates `jsdom` from 30.1.2 to 30.1.3
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Commits](jsdom/jsdom@v30.1.2...v30.1.3)

Updates `peggy` from 5.1.0 to 5.1.1
- [Release notes](https://github.com/peggyjs/peggy/releases)
- [Changelog](https://github.com/peggyjs/peggy/blob/main/CHANGELOG.md)
- [Commits](peggyjs/peggy@v5.1.0...v5.1.1)

Updates `vite` from 8.3.4 to 8.3.5
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v8.3.5/packages/vite)

Updates `vitest` from 5.0.4 to 5.0.5
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md)
- [Commits](https://github.com/vitest-dev/vitest/commits/v5.0.5/packages/vitest)

---
updated-dependencies:
- dependency-name: mobx
  dependency-version: 7.1.1
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: javascript-dependencies
- dependency-name: "@biomejs/biome"
  dependency-version: 2.6.3
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: javascript-dependencies
- dependency-name: jsdom
  dependency-version: 30.1.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: javascript-dependencies
- dependency-name: peggy
  dependency-version: 5.1.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: javascript-dependencies
- dependency-name: vite
  dependency-version: 8.3.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: javascript-dependencies
- dependency-name: vitest
  dependency-version: 5.0.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: javascript-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

* pin mobx to <17

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
* prevent comparison set with no outcome/study pop from being created

* stay on biome 2.5

* add model-bakery

* add test serializer tests

* fix depdency name
shapiromatron and others added 4 commits November 16, 2026 06:26
* speed up tests

* clear throttle cache

* fix coverage

* update poe commands

* use local, non-redis cache

* run in parallel

* revert

* clear cache

* remove self

* reset a few things

* disable plugins for integration tests?

* fix integration?

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

0