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

Backport bug fixes for 7.0.1 release #562

Merged
merged 6 commits into from
Jul 8, 2020
Merged

Conversation

kitchoi
Copy link
Contributor

@kitchoi kitchoi commented Jul 8, 2020

This PR backports bug fixes for the 7.0.1 release.

corranwebster and others added 4 commits July 8, 2020 13:09
This should stop the sporadic test failures caused by referencing memory
which has been freed and used by something else.  The fix is to attach the
numpy array with the allocated memory to the QImage, so that the lifetime
of the array is at least as long as that of the QImage.
* Provide sizeHint to QWidget

* REF : Restore qt4 conditional branch

	modified:   pyface/ui/qt4/tasks/main_window_layout.py

* TST: Test Qt dock widget has the correct size (#552)

Co-authored-by: Sai Rahul Poruri <rporuri@enthought.com>
Co-authored-by: Kit Choi <kitchoi@users.noreply.github.com>
Copy link
Contributor

@rahulporuri rahulporuri left a comment

Choose a reason for hiding this comment

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

Changes LGTM. Just waiting for CI to also go green.

* Update .travis.yml to include libglu1-mesa-dev for Qt

* Restore libxkbcommon-x11 and move other dependencies up

* Fix package name for libsdl

* Add a debug flag

* Add libxcb-iccm4

* Continue the same exercise for pyside2, add libxcb-image

* Giving up - let's use the same packages

* Add libxml2 for osx image

* Use brew manually
See https://travis-ci.community/t/macos-build-fails-because-of-homebrew-bundle-unknown-command/7296/28

* Try a newer osx image

* Add a comment

* Is libdbus still needed?

* Remove debugging flag - it is noisy and is embedded in between tests
Copy link
Contributor

@rahulporuri rahulporuri left a comment

Choose a reason for hiding this comment

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

still LGTM

@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (maint/7.0@ac89315). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             maint/7.0     #562   +/-   ##
============================================
  Coverage             ?   36.95%           
============================================
  Files                ?      470           
  Lines                ?    26003           
  Branches             ?     3959           
============================================
  Hits                 ?     9610           
  Misses               ?    15970           
  Partials             ?      423           

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 ac89315...13a82f2. Read the comment docs.

@kitchoi kitchoi merged commit 99cb1f4 into maint/7.0 Jul 8, 2020
@kitchoi kitchoi deleted the cherry-pick-to-maint-7.0 branch July 8, 2020 14:50
@kitchoi kitchoi mentioned this pull request Jul 8, 2020
16 tasks
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.

5 participants