Repository navigation
Merge main into model-v2 (clears #24's conflict) - #31
Merged
Merged
Conversation
PR #24 (model-v2) triggered 87 Pipeline and 87 Dashboard runs from 2026-10-06 01:20 to 10-07 03:16 UTC; sampled Pipeline jobs ran about 10 minutes after waiting 23 to 86 minutes for a shared org runner. model-v2 added this same concurrency block on 10-06; add it on main too (identical text, so the PR merges cleanly) and give both jobs timeouts. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
FRS records are licensed data, so nothing published may describe one survey record, its weighted contribution to a total included. Remove largest_household, concentration_by_year, largest_record_bn and net_excluding_largest_record from data/results.json and the dashboard copy (scripts/redact_single_record_fields.py; deletions only), drop the dashboard's single-household notes, table columns and summary line, and test that no published JSON carries these keys at any depth. src/ is unchanged so the committed results stay fresh against their source hashes. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
model-v2 already strips single-record fields in the pipeline (redact_records) and tests it. Take model-v2's StepPopulation, dataHelpers, trajectoryHelpers and test_results; keep #26's redaction script, CI changes and its dashboard guard test. pytest 1,729 passed; dashboard 152 passed; lint and build pass. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This branch was successfully deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brings main's two commits not yet in model-v2 — #25 (CI: cancel superseded runs, job timeouts) and #26 (stop publishing single-record diagnostics) — into model-v2, so #24 can merge to main.
Conflicts. model-v2 already strips the single-record fields in the pipeline (
pipeline.redact_records) and tests that, so where #26's edits overlap (StepPopulation, dataHelpers, trajectoryHelpers, tests/test_results.py) this keeps model-v2's version. It keeps #26'sscripts/redact_single_record_fields.py(running it changes nothing: the committed results carry none of those keys), #25/#26's workflow changes, and #26's dashboard guard test ("never reports a single survey record").Checks (local): pytest 1,729 passed; dashboard tests 152 passed; lint and build pass. Results files unchanged.
After this: #24 (model-v2 → main) should be conflict-free.
🤖 Generated with Claude Code