Conversation
* Update pyproject.toml * Update __init__.py * Update pyproject.toml
![scitools-ci[bot]](https://avatars.githubusercontent.com/in/212324?s=60&v=4){kind=small}
There was a problem hiding this comment.
Templating
This PR includes changes that may be worth sharing via templating. For each file listed below, please either:
- Action the suggestion via a pull request editing/adding the relevant file in the SciTools/.github
templates/directory. 1 - Raise an issue against the SciTools/.github repo for the above action if you really don't have 10mins spare right now. Include an assignee, to avoid it being forgotten.
- Dismiss the suggestion if the changes are not suitable for templating.
You will need to dismiss this review before this PR can be merged. Recommend the reviewer does this as their final action before merging, as this text will continually update as commits come in.
Templated files
The following changed files are templated:
-
pyproject.toml, templated bySciTools/.github/templates/pyproject.toml
Footnotes
-
Include this text in the PR body to avoid any notifications about applying the template changes back to the source repo!
@scitools-templating: please no update notification on: tephi↩
trexfeathers
dismissed
scitools-ci[bot]’s stale review
Just dependencies changing in pyproject.toml, which are not appropriate for templating.
| from . import artists, isopleths, transforms | ||
|
|
||
| __version__ = "0.4.0.dev0" | ||
| __version__ = "0.4.0.post0" |
There was a problem hiding this comment.
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
-
this is one of the ways
setuptools_scmmakes things easier - no need to worry about the history so straight merging is less problematic. ↩
There was a problem hiding this comment.
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?
2 participants
🚀 Pull Request
Description