From 2ea620726842ff9978674332e9c1617d67f41ba3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Aug 2026 06:01:43 +0000 Subject: [PATCH 1/3] chore(main): release pisd-shape 0.2.0 --- .release-please-manifest.json | 2 +- src/pisd_shape/src/pisd_shape/CHANGELOG.md | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/pisd_shape/src/pisd_shape/CHANGELOG.md diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 9ede7e3..ccc3bcd 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,4 +1,4 @@ { "src/ryandata_address_utils": "0.7.2", - "src/pisd_shape": "0.1.0" + "src/pisd_shape": "0.2.0" } diff --git a/src/pisd_shape/src/pisd_shape/CHANGELOG.md b/src/pisd_shape/src/pisd_shape/CHANGELOG.md new file mode 100644 index 0000000..e552e36 --- /dev/null +++ b/src/pisd_shape/src/pisd_shape/CHANGELOG.md @@ -0,0 +1,9 @@ +# Changelog + +## [0.2.0](https://github.com/Abstract-Data/RyanData-Address-Utils/compare/pisd-shape-v0.1.0...pisd-shape-v0.2.0) (2026-08-05) + + +### Features + +* Add pisd-shape submodule for PFISD attendance boundary shapefil… ([74bf3d8](https://github.com/Abstract-Data/RyanData-Address-Utils/commit/74bf3d8a65902a1fa6337751d4a08395d33f011f)) +* Add pisd-shape submodule for PFISD attendance boundary shapefile extraction ([82c5131](https://github.com/Abstract-Data/RyanData-Address-Utils/commit/82c513108bf7bd7793ae77385a872e8443fb87b6)) From 8489935c330135b775eb0c79406cfdbc229dafbd Mon Sep 17 00:00:00 2001 From: "claude[bot]" <41898282+claude[bot]@users.noreply.github.com> Date: Wed, 5 Aug 2026 06:20:15 +0000 Subject: [PATCH 2/3] fix: resolve release-please manifest conflict with main src/ryandata_address_utils was stale at 0.7.2 on this branch; main already bumped it to 0.8.0 via PR #15. Update to keep both bumps. Co-authored-by: John R. Eakin <48845615+jreakin@users.noreply.github.com> --- .release-please-manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index ccc3bcd..0fd7f72 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,4 +1,4 @@ { - "src/ryandata_address_utils": "0.7.2", + "src/ryandata_address_utils": "0.8.0", "src/pisd_shape": "0.2.0" } From 4d86f5fdfc4c01882d362dc757befc11f70e5689 Mon Sep 17 00:00:00 2001 From: "claude[bot]" <41898282+claude[bot]@users.noreply.github.com> Date: Wed, 5 Aug 2026 06:28:23 +0000 Subject: [PATCH 3/3] fix(release-please): consolidate per-component PRs to prevent manifest conflicts Setting separate-pull-requests to true caused release-please to maintain one branch per component, each with its own stale snapshot of the shared manifest file. When one component's release PR merged first, sibling PRs kept an outdated version entry until release-please happened to resync, producing the recurring manifest merge conflict on this PR. A single combined release PR keeps one manifest in sync across all components. Co-authored-by: John R. Eakin <48845615+jreakin@users.noreply.github.com> --- release-please-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-please-config.json b/release-please-config.json index 00e3c3d..9f66ac6 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", "release-type": "simple", - "separate-pull-requests": true, + "separate-pull-requests": false, "packages": { "src/ryandata_address_utils": { "component": "address-utils",