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

fix: fix unsupported operand #76

Merged
merged 3 commits into from
Nov 9, 2022
Merged

Conversation

tlambert03
Copy link
Member

fixes unsupported operand type(s) for &: 'PySide6.QtCore.QKeyCombination' and 'KeyboardModifier' on the newest pyside6

side-note: fixes in https://github.com/napari/superqt/pull/133 should get pyside6 tests working again

@codecov
Copy link

codecov bot commented Nov 8, 2022

Codecov Report

Merging #76 (eb3e98f) into main (4c20668) will not change coverage.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main      #76   +/-   ##
=======================================
  Coverage   99.35%   99.35%           
=======================================
  Files          31       31           
  Lines        1707     1707           
=======================================
  Hits         1696     1696           
  Misses         11       11           
Impacted Files Coverage Δ
src/app_model/backends/qt/_qkeymap.py 100.00% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Contributor

@aganders3 aganders3 left a comment

Choose a reason for hiding this comment

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

This looks good to me. Tests pass locally (macOS) with both PyQt6 and PySide6.

One nit is that PYQT6 is now unused in this file so can be removed from the import.

@tlambert03 tlambert03 merged commit 8af6c93 into pyapp-kit:main Nov 9, 2022
@tlambert03 tlambert03 deleted the fix-qmods branch November 9, 2022 20:16
@tlambert03 tlambert03 added the bug Something isn't working label Nov 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Development

Successfully merging this pull request may close these issues.

2 participants