Skip to content

Merge main back to aaf-dev - #288

Merged
amandazhuyilan merged 10 commits into
aaf-devfrom
main
Jul 31, 2026
Merged

Merge main back to aaf-dev#288
amandazhuyilan merged 10 commits into
aaf-devfrom
main

Conversation

@amandazhuyilan

@amandazhuyilan amandazhuyilan commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

Merge main back to aaf-dev

amandazhuyilan and others added 10 commits July 17, 2026 10:10
- Add EDNA_EXPLORER to PlatformEnum + admin PLATFORM_MAPPING
- Alembic migration adding the EDNA_EXPLORER enum value
- Keep it out of DEFAULT_PLATFORMS so access is manual-approval only
- Tests: admin create + no auto-grant on registration

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* chore: bump dependencies

* fix: update to new Jinja2Templates API
* feat: gate off SBP memberships behind a config flag

* test: update tests for sbp enabled/disabled behaviour

* fix: also exclude SBP from admin filters
Co-authored-by: aai-release-please[bot] <282731126+aai-release-please[bot]@users.noreply.github.com>
…orer

# Conflicts:
#	tests/admin_api/test_admin.py
#	tests/test_biocommons_register.py
alembic-postgresql-enum recreates the enum type, which fails on PlatformEnum:
platform.id is a PK referenced by FKs in platformrolelink/platformmembership/
platformmembershiphistory, so recreation errors with 'foreign key constraint
cannot be implemented' (broke check-migrations on Postgres).

Revert the plugin (dep + env.py wiring + lockfile churn) and add EDNA_EXPLORER
in place via ALTER TYPE ... ADD VALUE, matching SBP (575a146957f2) and
REJECTED (c4c7a8e9b2d3). Verified upgrade/check/downgrade on Postgres + SQLite.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@amandazhuyilan
amandazhuyilan merged commit ab00610 into aaf-dev Jul 31, 2026
9 checks passed
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.

2 participants