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

Ensure we set Qt API versions for PyQt4 before importing QtCore #376

Merged
merged 3 commits into from
May 3, 2019

Conversation

corranwebster
Copy link
Contributor

Fixes #374

@codecov-io
Copy link

codecov-io commented May 3, 2019

Codecov Report

Merging #376 into master will decrease coverage by 0.02%.
The diff coverage is 33.33%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #376      +/-   ##
==========================================
- Coverage   36.35%   36.33%   -0.03%     
==========================================
  Files         481      481              
  Lines       26420    26424       +4     
  Branches     3915     3917       +2     
==========================================
- Hits         9604     9600       -4     
- Misses      16398    16404       +6     
- Partials      418      420       +2
Impacted Files Coverage Δ
pyface/qt/__init__.py 44.68% <33.33%> (-4.16%) ⬇️
pyface/ui/qt4/util/modal_dialog_tester.py 86.46% <0%> (-3.01%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 52f7ea2...fe7ac4a. Read the comment docs.

etstool.py Outdated
@@ -179,7 +179,8 @@ def install(runtime, toolkit, environment):
@click.option('--runtime', default='3.6')
@click.option('--toolkit', default='pyqt')
@click.option('--environment', default=None)
def test(runtime, toolkit, environment):
@click.option('--no-environment-vars', is_flag=True)
Copy link
Member

Choose a reason for hiding this comment

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

Worth adding some help for this option?

Copy link
Member

@mdickinson mdickinson left a comment

Choose a reason for hiding this comment

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

LGTM. Do I remember correctly that prepare_pyqt4 isn't needed for Python 3? If so, would be nice to have a comment in the source to that effect, so that when we drop Python 2 support it's clear that this workaround can be dropped as well.

@corranwebster corranwebster merged commit ed7f030 into master May 3, 2019
@corranwebster corranwebster deleted the fix/pyqt-initialization branch May 3, 2019 11:46
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.

Qt API selection fails for PyQt4
3 participants