Skip to content
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.

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

Bump version v2.2.0a0 -> v2.2.0a1 #585

Merged
merged 1 commit into from
Apr 10, 2024

Conversation

danielhollas
Copy link
Contributor

I want to get a fix in #350 in a new alpha version.

Note, I've specifically opened this PR from my fork, to test @unkcpz observation that the tag from fork will not get transferred to origin when the PR is merged (which is most likely what will happen). In that case, I'll create the tag manually after merge.

Copy link

codecov bot commented Apr 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.17%. Comparing base (cc4291b) to head (826ad43).
Report is 3 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #585      +/-   ##
==========================================
+ Coverage   87.07%   96.17%   +9.10%     
==========================================
  Files          27       11      -16     
  Lines        4649     1177    -3472     
==========================================
- Hits         4048     1132    -2916     
+ Misses        601       45     -556     
Flag Coverage Δ
python-3.10 96.17% <ø> (+9.10%) ⬆️
python-3.9 96.17% <ø> (+9.07%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@superstar54 superstar54 left a comment

Choose a reason for hiding this comment

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

LGTM!

@danielhollas danielhollas merged commit 390a0d3 into aiidalab:master Apr 10, 2024
11 checks passed
@danielhollas
Copy link
Contributor Author

Cheers @superstar54

Indeed, the tag was not transferred from the forked repo, I've created it manually when making a release. It's nice that you can specify a specific commit for the tag.

image

@danielhollas danielhollas deleted the release/2.2.0a1 branch April 10, 2024 20:29
@@ -67,7 +67,7 @@ docs =
myst-nb

[bumpver]
current_version = "v2.2.0a0"
current_version = "v2.2.0a1"
version_pattern = "vMAJOR.MINOR.PATCH[PYTAGNUM]"
commit_message = "Bump version {old_version} -> {new_version}"
commit = True
Copy link
Member

Choose a reason for hiding this comment

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

If the tag from the fork is not sync to the repo, then it is meaningless to tag to the forked repo, we need to remove tag = True.

@unkcpz
Copy link
Member

unkcpz commented Apr 11, 2024

It's nice that you can specify a specific commit for the tag.

Now I am confusing again. If the tag has to be create manually, it entirely fallback to the strategy that create the tag to trigger the deployment (upload to PyPI). So in the end, I think we should use create tag to make the release (I think it is also quite standard, no?) What we learned and can added is using this CI review and approve, I don't remember where it is implemented and I am confused why I didn't see it now.

@danielhollas
Copy link
Contributor Author

Sorry for confusion. I think this is better to discuss in person (unfortunately I will not be able to make it to today's meeting).

tl;dr IMO the solution here is to always push the release branches to origin, and not forked repo. In fact in the guide on the wiki I've explicitly written that one should always clone a fresh repository to make a release, and I stand by this, because this avoids all kinds of issues:

  • forgetting to pull the lastest main before making a release
  • accidentally pushing to forked repo instead of origin

Also, in case of python packages published on PYPI, pushing the release branch to origin allows you to publish the release on TestPyPI first, where you can verify the package before the actual release. This is not possible to do from fork due to missing PYPI secrets.

@unkcpz
Copy link
Member

unkcpz commented Apr 12, 2024

pushing the release branch to origin allows you to publish the release on TestPyPI first, where you can verify the package before the actual release.

This is a good point and I totally agree. So we can either always ask to run bumpver from a newly cloned folder or add a option to bumpver to push to a certain remote. Let's discuss in person.

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.

3 participants