diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 33e0e82bf..b8deedca7 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -1,5 +1,11 @@ # Unified workflow for pushes to main. # +# MAINTENANCE BRANCH COPY (release/uk-autumn-budget-2026): this branch publishes the Autumn +# Budget 2026 dashboard's certified UK bundle (policyengine-uk 2.165.1) under a +# version below main's line. Here the workflow runs on pushes to this branch, +# never deploys docs or bumps the version (both are main-only), does not mark +# the GitHub release as latest, and notifies only the Budget dashboard. +# # Phase 1 (normal push): Lint + Test → Docs + Versioning # Versioning commits with message "Update package version". # The commit pushes to main, re-triggering this workflow for Phase 2. @@ -18,7 +24,7 @@ name: Push to main on: push: branches: - - main + - release/uk-autumn-budget-2026 workflow_dispatch: permissions: @@ -85,7 +91,7 @@ jobs: name: Deploy documentation runs-on: ubuntu-latest needs: [Lint, Test] - if: github.event.head_commit.message != 'Update package version' + if: github.ref_name == 'main' && github.event.head_commit.message != 'Update package version' concurrency: group: 'pages' cancel-in-progress: false @@ -116,7 +122,7 @@ jobs: Versioning: runs-on: ubuntu-latest needs: [Lint, Test] - if: github.event.head_commit.message != 'Update package version' + if: github.ref_name == 'main' && github.event.head_commit.message != 'Update package version' steps: - name: Generate GitHub App token id: app-token @@ -236,8 +242,8 @@ jobs: VERSION=$(python .github/fetch_version.py) gh release create "$VERSION" \ --title "v$VERSION" \ - --notes "See [CHANGELOG.md](https://github.com/PolicyEngine/policyengine.py/blob/main/CHANGELOG.md) for details." \ - --latest \ + --notes "See [CHANGELOG.md](https://github.com/PolicyEngine/policyengine.py/blob/release/uk-autumn-budget-2026/CHANGELOG.md) for details." \ + --latest=false \ "release-assets/policyengine-bundle-$VERSION.json" \ "release-assets/policyengine-bundle-$VERSION.constraints.txt" \ "release-assets/policyengine-bundle-$VERSION.citation.txt" \ @@ -275,6 +281,7 @@ jobs: VERSION: ${{ needs.Publish.outputs.version }} run: python scripts/release_consumers.py payload --version "$VERSION" > "$RUNNER_TEMP/release-payload.json" - name: Generate GitHub App token + if: github.ref_name == 'main' id: app-token uses: actions/create-github-app-token@v1 with: @@ -283,6 +290,7 @@ jobs: owner: PolicyEngine repositories: policyengine-api,policyengine-sim-api - name: Dispatch policyengine-release to consumer repos + if: github.ref_name == 'main' env: GH_TOKEN: ${{ steps.app-token.outputs.token }} VERSION: ${{ needs.Publish.outputs.version }} @@ -309,6 +317,7 @@ jobs: CONSUMER_REPOS: uk-autumn-budget-dashboard-2026 run: bash .github/dispatch-policyengine-release.sh - name: Install the released bundle for the replay request + if: github.ref_name == 'main' continue-on-error: true id: released env: diff --git a/CHANGELOG.md b/CHANGELOG.md index d1799a77c..bad506fe1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## [6.16.2] - 2026-11-11 + +### Changed + +- Certify Microcosm UK for policyengine-uk 2.165.1: the national `microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7` (`microcosm_uk_2024_25`), built with 2.165.1 from PolicyEngine/microcosm#1491 at `dd99a1dcd`, and the local-area cut `microcosm-uk-2024-25-dense-20261104T093024Z-83802786` (`microcosm_uk_2024_25_dense`), which constituency and local-authority regions route to. The national binds HMRC's 2024-25 company car holders, taxable value and fuel counts, and bands SPI records on total income net of expenses. The local-area cut is built from the same commit and spine with its gate-only sign-off (`5293966d4`), also on 2.165.1, so both certify on their own build: area runs read every input the engine takes, company cars and ISA payments included. They replace the national `microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e` and the local-area cut `microcosm-uk-2024-25-dense-20261107T173210Z-38605444`, so the national no longer carries the FRS full-time education flag or the bound single years of age 16 to 24. The UK model pin moves from policyengine-uk 2.174.1 back to 2.165.1 (policyengine-core stays 3.33.3), so UK results change with both the model and the data. policyengine-uk 2.165.1 predates 2.170.0 (PolicyEngine/policyengine-uk#2719), so UK current law no longer includes the Autumn Budget 2026 measures: the Household Energy Payment, the Pension Tax Allowance, the Carer's Allowance taper, the higher savings and property income rates, the £3,000 trading allowance, and the fuel duty and domestic electricity VAT extensions. +- This maintenance release serves the UK Autumn Budget 2026 dashboard, which scores each Budget measure against pre-Budget law. It carries release 6.17.1's code with the UK record above. The 6.17 line keeps policyengine-uk 2.174.1, where current law includes the Budget measures. + + ## [6.17.1] - 2026-11-10 ### Fixed diff --git a/changelog.d/certify-uk-microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7.changed.md b/changelog.d/certify-uk-microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7.changed.md deleted file mode 100644 index 17655d3d9..000000000 --- a/changelog.d/certify-uk-microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7.changed.md +++ /dev/null @@ -1 +0,0 @@ -Certify Microcosm UK for policyengine-uk 2.165.1: the national `microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7` (`microcosm_uk_2024_25`), built with 2.165.1 from PolicyEngine/microcosm#1491 at `dd99a1dcd`, and the local-area cut `microcosm-uk-2024-25-dense-20261104T093024Z-83802786` (`microcosm_uk_2024_25_dense`), which constituency and local-authority regions route to. The national binds HMRC's 2024-25 company car holders, taxable value and fuel counts, and bands SPI records on total income net of expenses. The local-area cut is built from the same commit and spine with its gate-only sign-off (`5293966d4`), also on 2.165.1, so both certify on their own build: area runs read every input the engine takes, company cars and ISA payments included. They replace the national `microcosm-uk-2024-25-national-20261107T020434Z-eeb6093e` and the local-area cut `microcosm-uk-2024-25-dense-20261107T173210Z-38605444`, so the national no longer carries the FRS full-time education flag or the bound single years of age 16 to 24. The UK model pin moves from policyengine-uk 2.174.1 back to 2.165.1 (policyengine-core stays 3.33.3), so UK results change with both the model and the data. policyengine-uk 2.165.1 predates 2.170.0 (PolicyEngine/policyengine-uk#2719), so UK current law no longer includes the Autumn Budget 2026 measures: the Household Energy Payment, the Pension Tax Allowance, the Carer's Allowance taper, the higher savings and property income rates, the £3,000 trading allowance, and the fuel duty and domestic electricity VAT extensions. diff --git a/pyproject.toml b/pyproject.toml index a56282f46..2927b5020 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "policyengine" -version = "6.17.1" +version = "6.16.2" description = "A package to conduct policy analysis using PolicyEngine tax-benefit models." readme = "README.md" authors = [ diff --git a/src/policyengine/data/bundle/manifest.json b/src/policyengine/data/bundle/manifest.json index 730406831..97945a73c 100644 --- a/src/policyengine/data/bundle/manifest.json +++ b/src/policyengine/data/bundle/manifest.json @@ -1,10 +1,10 @@ { - "bundle_version": "6.17.1", + "bundle_version": "6.16.2", "citation": { "publisher": "PolicyEngine", - "title": "PolicyEngine bundle 6.17.1", + "title": "PolicyEngine bundle 6.16.2", "type": "software-bundle", - "version": "6.17.1" + "version": "6.16.2" }, "countries": { "uk": { @@ -17,7 +17,7 @@ "data_releases": { "uk": { "build_id": "microcosm-uk-2024-25-national-20261103T154302Z-0639b9c7", - "bundle_id": "uk-6.17.1", + "bundle_id": "uk-6.16.2", "certification": { "built_with_model_version": "2.165.1", "certified_by": "policyengine.py bundle certification", @@ -111,7 +111,7 @@ "version": "2.165.1", "wheel_url": "https://files.pythonhosted.org/packages/eb/3c/4db973ea84deb97e32a4a67a832babbade2475f2df9edc7a2494dae86d69/policyengine_uk-2.165.1-py3-none-any.whl" }, - "policyengine_version": "6.17.1", + "policyengine_version": "6.16.2", "region_datasets": { "constituency": { "path_template": "microcosm_uk_2024_25_dense.h5" @@ -134,7 +134,7 @@ }, "us": { "build_id": "populace-us-2024-spm-20260915", - "bundle_id": "us-6.17.1", + "bundle_id": "us-6.16.2", "certification": { "built_with_model_version": "2.2.1", "certified_by": "policyengine.py bundle certification", @@ -239,7 +239,7 @@ "version": "2.2.1", "wheel_url": "https://files.pythonhosted.org/packages/5e/09/86ac3968d2a18e28fce3ba1186fc21728e9f299b96a806d6f204f1e0aaed/policyengine_us-2.2.1-py3-none-any.whl" }, - "policyengine_version": "6.17.1", + "policyengine_version": "6.16.2", "region_datasets": { "congressional_district": { "path_template": "populace_us_2024_acs_local.h5" @@ -349,10 +349,10 @@ "packages": { "policyengine": { "import_name": "policyengine", - "install_requirement": "policyengine==6.17.1", + "install_requirement": "policyengine==6.16.2", "name": "policyengine", "role": "bundle_carrier", - "version": "6.17.1" + "version": "6.16.2" }, "policyengine-core": { "import_name": "policyengine_core", @@ -388,6 +388,6 @@ "wheel_url": "https://files.pythonhosted.org/packages/19/a0/c484f69a0ebf88a9b9fd0ac28176f8df66550f46714f1b0c5ec0b360824e/spm_calculator-1.0.0-py3-none-any.whl" } }, - "policyengine_version": "6.17.1", + "policyengine_version": "6.16.2", "schema_version": 2 } diff --git a/src/policyengine/data/bundle/uk.trace.tro.jsonld b/src/policyengine/data/bundle/uk.trace.tro.jsonld index 8d53b0538..b49053d0e 100644 --- a/src/policyengine/data/bundle/uk.trace.tro.jsonld +++ b/src/policyengine/data/bundle/uk.trace.tro.jsonld @@ -18,18 +18,18 @@ "schema:url": "https://policyengine.org" }, "schema:dateCreated": "2026-11-03T17:07:52.460115+00:00", - "schema:description": "TRACE TRO for certified runtime bundle uk-6.17.1 covering the bundle manifest, the certified dataset artifact, the country model wheel, and the country data release manifest when it is available.", + "schema:description": "TRACE TRO for certified runtime bundle uk-6.16.2 covering the bundle manifest, the certified dataset artifact, the country model wheel, and the country data release manifest when it is available.", "schema:name": "policyengine uk certified bundle TRO", "trov:createdWith": { "@type": "schema:SoftwareApplication", "schema:name": "policyengine", - "schema:softwareVersion": "6.17.1" + "schema:softwareVersion": "6.16.2" }, "trov:hasArrangement": [ { "@id": "arrangement/1", "@type": "trov:ArtifactArrangement", - "rdfs:comment": "Certified arrangement for bundle uk-6.17.1.", + "rdfs:comment": "Certified arrangement for bundle uk-6.16.2.", "trov:hasArtifactLocation": [ { "@id": "arrangement/1/location/bundle_manifest", @@ -75,7 +75,7 @@ "@type": "trov:ResearchArtifact", "schema:name": "policyengine.py bundle manifest for uk", "trov:mimeType": "application/json", - "trov:sha256": "ad56f3d87508050077491d3c0996ecd49fdf4778500e224bbd651b549a87f087" + "trov:sha256": "aa1b5b5ddde72aafbfd42835985d79df65498a088dbd622ed64ce440345923d8" }, { "@id": "composition/1/artifact/data_release_manifest", @@ -102,7 +102,7 @@ "trov:hasFingerprint": { "@id": "composition/1/fingerprint", "@type": "trov:CompositionFingerprint", - "trov:sha256": "f8fccf6a0a8837c073d4758c852fba2d234de75cb7ae953937a494e37a69cc9c" + "trov:sha256": "f58c712b5839d02289048ab1f0dfdccba9bcf8a016706f5006ca51dbd1f286ca" } }, "trov:hasPerformance": { diff --git a/src/policyengine/data/bundle/us.trace.tro.jsonld b/src/policyengine/data/bundle/us.trace.tro.jsonld index 16676a018..afde01ebe 100644 --- a/src/policyengine/data/bundle/us.trace.tro.jsonld +++ b/src/policyengine/data/bundle/us.trace.tro.jsonld @@ -17,18 +17,18 @@ "schema:name": "PolicyEngine", "schema:url": "https://policyengine.org" }, - "schema:description": "TRACE TRO for certified runtime bundle us-6.17.1 covering the bundle manifest, the certified dataset artifact, the country model wheel, and the country data release manifest when it is available.", + "schema:description": "TRACE TRO for certified runtime bundle us-6.16.2 covering the bundle manifest, the certified dataset artifact, the country model wheel, and the country data release manifest when it is available.", "schema:name": "policyengine us certified bundle TRO", "trov:createdWith": { "@type": "schema:SoftwareApplication", "schema:name": "policyengine", - "schema:softwareVersion": "6.17.1" + "schema:softwareVersion": "6.16.2" }, "trov:hasArrangement": [ { "@id": "arrangement/1", "@type": "trov:ArtifactArrangement", - "rdfs:comment": "Certified arrangement for bundle us-6.17.1.", + "rdfs:comment": "Certified arrangement for bundle us-6.16.2.", "trov:hasArtifactLocation": [ { "@id": "arrangement/1/location/bundle_manifest", @@ -74,7 +74,7 @@ "@type": "trov:ResearchArtifact", "schema:name": "policyengine.py bundle manifest for us", "trov:mimeType": "application/json", - "trov:sha256": "ad56f3d87508050077491d3c0996ecd49fdf4778500e224bbd651b549a87f087" + "trov:sha256": "aa1b5b5ddde72aafbfd42835985d79df65498a088dbd622ed64ce440345923d8" }, { "@id": "composition/1/artifact/data_release_manifest", @@ -101,7 +101,7 @@ "trov:hasFingerprint": { "@id": "composition/1/fingerprint", "@type": "trov:CompositionFingerprint", - "trov:sha256": "d1b16162405e00be9800178061f66b0530cb297c9c50e223991d1f8df4948763" + "trov:sha256": "739514e9ac81cf6a5ae0e2aec6876210acca0751143df0ac6fbcfd63aacb0b72" } }, "trov:hasPerformance": { diff --git a/uv.lock b/uv.lock index 596c4f7da..ade5541a9 100644 --- a/uv.lock +++ b/uv.lock @@ -1816,7 +1816,7 @@ wheels = [ [[package]] name = "policyengine" -version = "6.17.1" +version = "6.16.2" source = { editable = "." } dependencies = [ { name = "h5py" },