-
Notifications
You must be signed in to change notification settings - Fork 18
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
Merge 0.8-dev to master #2692
Comments
I tested merging in my fork repos. I merged the latest commit from 0.8-dev to master (just like we merge feature branches), then solved all conflicts based on what was in 0-8-dev branch. There were only about 10 files in spine-toolbox and spine-items that needed conflict resolution, less than 10 files in both spine-engine and spinedb-api. Then I just fixed the requirements.txt in both spine-toolbox and spine-items to point to master again, fixed some repo paths in github actions and voilá. All tests passed on the first try and the app seems to be working fine. There was some traceback related to the cat animation but I'm not sure if this has something to do with a brand new PySide6 version (6.7.0). On second try I could not reproduce the traceback anymore. If you want to try master after 0.8-dev has been merged, clone Spine-Toolbox from my personal stash and do |
@PekkaSavolainen Thank you so much for the test! Sounds like we can omit the revert step and just merge as usual. |
Merging PR #2701 ticks the second box in the task list. |
#2725 needs to be fixed before we can proceed with this. I am working on it. |
I will fix #2723 before releasing 0.8 to PyPI. |
With the release of 0.8.0 we are done here. |
Plan to merge
0.8-dev
tomaster
:CHANGELOG.md
is up-to-date (Check that CHANGELOG.md is up-to-date for 0.8-dev #2693, Check that CHANGELOG.md is up-to-date for 0.8-dev Spine-Database-API#386)master
(just once) (Get Upgrade notification ready for the 0.8-dev -> master merge #2699)requirements.txt
to pull from other release branches- [ ] Revertmaster
back tolast-merged-to-entity-branch
tag so as to minimize merge conflicts in all four repositories0.8-dev
tomaster
in all four repositories, resolve merge conflicts (see @PekkaSavolainen's post below)requirements.txt
points again tomaster
, not0.8-dev
- [ ] Close eyes, hope for the bestWe are not descended from fearful men.CHANGELOG.md
)Edit: dropped the "Revert
master
" step according to the discussion below.The text was updated successfully, but these errors were encountered: