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

Sync with 4.2.1 #28

Merged
merged 14 commits into from
Feb 21, 2024
Merged

Sync with 4.2.1 #28

merged 14 commits into from
Feb 21, 2024

Conversation

n-elie
Copy link

@n-elie n-elie commented Feb 6, 2024

Update to Qt-Advanced-Docking-System v4.2.1

This fixes #23 and #24 (_ads has to be renamed ads in init.py to get better error message when using wrong arguments of functions)

Also updated actions to remove deprecated node.js 16 warnings and updated cibuildwheel action to 2.16.5 because of pypa/cibuildwheel#1741. With actions/upload-script v4, artifacts are immutable, so a merge step is needed.

And updated custom-auditwheel script because auditwheel.policy does not have _POLICIES global anymore

@n-elie n-elie marked this pull request as draft February 6, 2024 13:18
@n-elie n-elie marked this pull request as ready for review February 6, 2024 15:37
@mliberty1
Copy link

@n-elie Thanks for your work in putting this together!

@mborgerson Is this planned to be merged and released to pypi soon? I would love to have the fixes from ADS 4.2.1 (releases) and PySide 6.6.2 (released Feb 15 release notes). Please let me know if you want any help to get this released!

@mborgerson
Copy link
Owner

@mliberty1 I'll take a look sometime this week and merge if all looks good. In the mean time feel free to help review and test the changes

@mliberty1
Copy link

I have been running the Joulescope UI with this pull request and PySide 6.6.2, built from my fork. I have tested on:

Windows 11 arm64, Python 3.11.8
macOS 14.3.1 x86-64, Python 3.11.7
macOS 14.3.1 arm64, Python 3.11.7

Everything is running great over the last 2 days with no regressions or crashes that I have seen. Rearranging docks widgets and save/restore on dock widgets works great.

I inspected the pull request, and it looks good to me.

I recently made very similar GitHub Actions changes to my repos. Those GitHub Actions changes look good, too. They built in my fork worked without any changes.

For the new enums, this runs correctly:

import PySide6QtAds as QtAds
print(QtAds.CDockManager.AutoHideHasMinimizeButton)
print(QtAds.CDockManager.AutoHideHasCloseButton)
print(QtAds.CDockManager.DisableTabTextEliding)

I wasn't quite sure how to test addAutoHideDockWidgetToContainer quickly, and I don't even see any example that uses this method in Qt-Advanced-Docking-System.

My opinion is to release. PySide 6.6.2 and Qt-ADS 4.2.0 & 4.2.1 have some critical fixes (especially for macOS) that are far more important than fully validating the addAutoHideDockWidgetToContainer binding.

@mborgerson
Copy link
Owner

@mliberty1 Thanks for testing!

@mborgerson
Copy link
Owner

Hmm.. this PR appears to update the submodule to v4.2.0 not v4.2.1. The fix is easy so I'll just merge and adjust the pointer. Also, in the future please avoid fixing unrelated issues together in a PR.

Thanks for the work @n-elie

@mborgerson mborgerson merged commit d1bacba into mborgerson:main Feb 21, 2024
7 checks passed
@mborgerson
Copy link
Owner

@mliberty1 fyi release is pushed

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.

error using addAutoHideDockWidget / SideBarLocation
3 participants