Skip to content

V0.4.x mergeback #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ESadek-MO wants to merge 2 commits into
base: main
Choose a base branch
from
Open

V0.4.x mergeback #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
665e76d
Update __init__.py (#247)
ESadek-MO Jan 29, 2026
debf624
v0.4.0.post0 (#249)
ESadek-MO Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ license = "BSD-3-Clause"
license-files = ["LICENSE"]
name = "tephi"
requires-python = ">=3.10"
dependencies = ["matplotlib", "numpy", "scipy"]
dependencies = ["matplotlib", "numpy", "scipy", "shapely"]

[project.urls]
Code = "https://github.com/SciTools/tephi"
Expand Down
2 changes: 1 addition & 1 deletion tephi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import math
from . import artists, isopleths, transforms

__version__ = "0.4.0.dev0"
__version__ = "0.4.0.post0"
Copy link
Contributor

@trexfeathers trexfeathers Mar 20, 2026

Choose a reason for hiding this comment

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

It's a long time since we've done manual versioning plus release branches, but if we go looking we can see that we don't let the release version pollute the history on main:

In the above example, the release branch had the version 3.1.0rc0, but this was not merged onto main. I think this was achievable because Patrick was using a dedicated branch to manage the mergeback, so was able to make edits where appropriate. Not an option on this PR since it's merging straight from v0.4.x1 .

Options:

  • Accept a polluted history: merge this PR then quickly do another one fixing the __version__ tag.
  • Get more technical: close this PR, handle the mergeback using a dedicated branch (like you would with any other PR), where you can fix the __version__ tag before submitting.

Footnotes

  1. this is one of the ways setuptools_scm makes things easier - no need to worry about the history so straight merging is less problematic. ↩

Copy link
Contributor

@trexfeathers trexfeathers Mar 20, 2026

Choose a reason for hiding this comment

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

EDIT: sorry, I only just realised there is a precedent in Tephi to go with the 2nd option:

Still happy with that this time @ESadek-MO?


from .artists import WetAdiabatArtist, IsobarArtist, HumidityMixingRatioArtist

Expand Down
Loading