Skip to content

Conversation

lan496
Copy link
Member

@lan496 lan496 commented Dec 6, 2023

Closes #350

After this PR is merged, I'll put v2.2.0 tag to the commit.

List of merged PRs were generated by

gh pr list --state merged --search "merged:>2023-09-09" --json url,title,number | jq -r '.[] | "[[#\(.number)]](\(.url)) - \(.title)"'

@lan496 lan496 requested review from atztogo and LecrisUT December 6, 2023 11:17
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (68d276b) 83.80% compared to head (9d7f68b) 83.80%.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop     #372   +/-   ##
========================================
  Coverage    83.80%   83.80%           
========================================
  Files           24       24           
  Lines         8167     8167           
========================================
  Hits          6844     6844           
  Misses        1323     1323           
Flag Coverage Δ
c_api 77.18% <ø> (ø)
fortran_api 56.19% <ø> (ø)
python_api 80.47% <ø> (ø)
unit_tests 1.24% <ø> (ø)

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.

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"

[project]
name = "spglib"
version = "2.1.0"
version = "2.2.0"
requires-python = ">=3.7"
Copy link
Collaborator

Choose a reason for hiding this comment

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

python 3.7 is EOL. Should we change it to 3.8? For me, either is fine.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Agree should drop 3.7. Let's do it the first thing after the release

Copy link
Collaborator

@LecrisUT LecrisUT left a comment

Choose a reason for hiding this comment

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

Also update the version in CMakeLists.txt

@lan496
Copy link
Member Author

lan496 commented Dec 7, 2023

I also agree with @LecrisUT. Let's consider to drop Python 3.7 after this release.
#373

@lan496
Copy link
Member Author

lan496 commented Dec 7, 2023

I will merge this PR and release v2.2.0 tomorrow.

@atztogo
Copy link
Collaborator

atztogo commented Dec 7, 2023

I will merge this PR and release v2.2.0 tomorrow.

Thanks @lan496!

@lan496 lan496 merged commit f052268 into spglib:develop Dec 8, 2023
@lan496
Copy link
Member Author

lan496 commented Dec 8, 2023

git checkout develop
git pull upstream develop
git tag v2.2.0
git push upstream v2.2.0

@lan496 lan496 deleted the release-2.2.0 branch December 8, 2023 01:14
@lan496
Copy link
Member Author

lan496 commented Dec 8, 2023

Oops, I forgot to revert sphinx-book-theme dependency.
https://github.com/spglib/spglib/actions/runs/7136063269/job/19434451228

@LecrisUT
Copy link
Collaborator

LecrisUT commented Dec 8, 2023

Oh you're right, forgot about that as well. There is a pre-release out, I can patch the rtd to get it working when I get to work.

Do you want to move the tag after that?

@lan496
Copy link
Member Author

lan496 commented Dec 8, 2023

🙏

@lan496
Copy link
Member Author

lan496 commented Dec 8, 2023

For now, I will create a new branch to release v2.2.0 and revert the commit.

@lan496
Copy link
Member Author

lan496 commented Dec 8, 2023

gco -b release-v2.2.0
git revert 16a1efd
git tag v2.2.0 -f
git push upstream release-v2.2.0
git push upstream v2.2.0 -f

@LecrisUT
Copy link
Collaborator

LecrisUT commented Dec 8, 2023

I was concerned that the documentation would not build (and it doesn't), but apparently we caught a bug/race-condition in rtd that it still used the old commit

https://readthedocs.org/projects/spglib/builds/22790068/

We can count our blessings and leave it at this, or we force push the tag again

PS: No need for a new branch for this since main should have this commit as well. But naming convention should be release-v2.2 can still rename the branch since the tag is independent of that, or better yet, delete after we have that commit in develop, until we find a need for patching/releasing v2.2.1

@lan496
Copy link
Member Author

lan496 commented Dec 8, 2023

I've renamed the branch to release-v2.2
image

I'm making PR to merge release-v2.2 into develop.

@LecrisUT
Copy link
Collaborator

LecrisUT commented Dec 8, 2023

I'm making PR to merge release-v2.2 into develop.

Let me take over that, I'll add the fixes to rtd there as well

@lan496
Copy link
Member Author

lan496 commented Dec 8, 2023

@LecrisUT Thanks. I defer to you for applying patch on top of release-v2.2. Then, let's release v2.2.1 quickly.

@LecrisUT
Copy link
Collaborator

LecrisUT commented Dec 8, 2023

No need for a v2.2.1 since this only affects CI

@LecrisUT LecrisUT added this to the 2.2 milestone Jan 25, 2024
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.

Releasing v2.2.0
4 participants