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

Merge 0.8-dev to master #2692

Closed
11 tasks done
soininen opened this issue Apr 9, 2024 · 6 comments
Closed
11 tasks done

Merge 0.8-dev to master #2692

soininen opened this issue Apr 9, 2024 · 6 comments
Assignees

Comments

@soininen
Copy link
Contributor

soininen commented Apr 9, 2024

Plan to merge 0.8-dev to master:

Edit: dropped the "Revert master" step according to the discussion below.

@ptsavol
Copy link
Member

ptsavol commented Apr 9, 2024

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 pip install -r requirements.txt in a conda or venv.

@soininen
Copy link
Contributor Author

I tested merging in my fork repos.

@PekkaSavolainen Thank you so much for the test! Sounds like we can omit the revert step and just merge as usual.

@soininen soininen self-assigned this Apr 12, 2024
@soininen
Copy link
Contributor Author

Merging PR #2701 ticks the second box in the task list.

@soininen
Copy link
Contributor Author

#2725 needs to be fixed before we can proceed with this. I am working on it.

@soininen
Copy link
Contributor Author

I will fix #2723 before releasing 0.8 to PyPI.

@soininen
Copy link
Contributor Author

With the release of 0.8.0 we are done here.

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

No branches or pull requests

2 participants