Skip to content

chore(repo): back-merge main into dev after v0.2.18 release (#287)#288

Merged
w7-mgfcode merged 3 commits into
devfrom
chore/back-merge-main-v0-2-18
May 25, 2026
Merged

chore(repo): back-merge main into dev after v0.2.18 release (#287)#288
w7-mgfcode merged 3 commits into
devfrom
chore/back-merge-main-v0-2-18

Conversation

@w7-mgfcode
Copy link
Copy Markdown
Owner

@w7-mgfcode w7-mgfcode commented May 25, 2026

Post-release back-merge for v0.2.18.

Closes #287.

⚠️ MERGE WITH `--merge`, NOT SQUASH

Per memory `back-merge-needs-merge-commit` and the v0.2.17 precedent (#271):

gh pr merge <N> --merge   # ← when CI is green; do NOT use --squash / --rebase

Squashing the back-merge flattens the two-parent merge commit so main never becomes an ancestor of dev, and the next dev → main release PR keeps re-conflicting on the release-please version files.

What's in this PR

The diff is exactly the release-please commit on main for v0.2.18:

  • CHANGELOG.md## [0.2.18] section
  • pyproject.tomlversion = "0.2.18"
  • .release-please-manifest.json".": "0.2.18"

Nothing else. No new feature work.

Verify after merge

git fetch origin
git rev-list --parents -n 1 origin/dev | tr ' ' '\n' | wc -l   # expect 3 (commit + 2 parents)
git merge-base --is-ancestor origin/main origin/dev && echo OK # expect OK

Summary by Sourcery

Back-merge the v0.2.18 release metadata from main into dev so branches share the same release history and versioning.

Enhancements:

  • Add the 0.2.18 changelog entry to align dev with the latest mainline release.
  • Bump the project version to 0.2.18 in pyproject and the release-please manifest on the dev branch.

release: prepare v0.2.18 — dockerize stack + batch-runner MVP
…n--components--forecastlabai

chore(main): release 0.2.18
@sourcery-ai
Copy link
Copy Markdown

sourcery-ai Bot commented May 25, 2026

Reviewer's Guide

Back-merge the v0.2.18 release commit from main into dev so dev’s history includes the release-please version and changelog updates, with no additional feature work.

Flow diagram for v0.2.18 back-merge from main into dev

flowchart LR
    subgraph pre_release[Before v0_2_18 release]
        dev_dev[dev branch]
        main_main[main branch]
        dev_dev -->|release PR| main_main
    end

    subgraph release[v0_2_18 release on main]
        main_main --> rel_commit[release_please_commit_v0_2_18]
    end

    subgraph back_merge[Back-merge PR_287]
        rel_commit --> pr_287[PR_287 back_merge]
        pr_287 --> dev_updated[dev branch with v0_2_18 changelog_and_version]
    end

    main_main -. merge-base ancestor .- dev_updated
Loading

File-Level Changes

Change Details Files
Align dev branch with main’s v0.2.18 release metadata and changelog via a merge-commit back-merge.
  • Add the v0.2.18 release section to the changelog, including features, fixes, and documentation entries generated by release-please.
  • Bump the project version from 0.2.17 to 0.2.18 in the Python project configuration.
  • Update the release-please manifest to record 0.2.18 as the current version for the root package.
CHANGELOG.md
pyproject.toml
.release-please-manifest.json

Possibly linked issues


Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 25, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 8da42154-ddfa-4e75-a9ff-32f5d14ddf96

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch chore/back-merge-main-v0-2-18

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@w7-mgfcode w7-mgfcode merged commit bc6b47e into dev May 25, 2026
15 checks passed
@w7-mgfcode w7-mgfcode deleted the chore/back-merge-main-v0-2-18 branch May 25, 2026 11:29
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.

1 participant