V1.5.x #5207
V1.5.x #5207
Conversation
Fix exception with Pillow 3
DOC: Cleaned up text in pyplot_tutorial.rst
Backport DOC: Fix description of draw_markers in api_changes.rst
Currently fails with qt5
Instead of a combining acute accent, use a single-codepoint encoding
DOC: Fix encoding for LaTeX
On Windows the `urlparse(...).scheme != ''` test for URLs does not work. For file names the drive letter is returned as scheme.
Removes a Mac metafile. Closes #5176
FIX: remove incorrect error checking
This issue is that the new 'default' qt version is 5 if it is available. In the tests the backend is Agg so we are hitting the fall through behavior. If both pyqt4 and pyqt5 are installed, then `QtCore` will be from PyQt5, but the backend_qt4Agg code assumes that it is seeing the PyQt4 version of the classes. This results in error on `__init__` due to the change between PyQt4 and PyQt5. Added test_backend_qt5.py to white listed tests. closes #5194
Do not let a `super` be called or the the c++ base-classes will be initialized twice which causes havoc. - pyside failed on figure creation - pyqt4 may segfault on exit closes #5196
If:
1. backend is not Qt{4,5}Agg
2. PyQt4 and PySide are installed, PyQt5 is not
3. backend.qt4 == 'PySide'
The fall through will start trying to import PyQt5 (so sip will be
imported as it is installed for PyQt4). It will then fall back to Qt4
using the binding specified in the rcparam ('PySide') which will then
miss the qt4 import conditionals which means QtCore is never imported
which means we get name errors from the pyqt / pyside patch up code.
This catches those exceptions and gives pyside a chance to be imported.
TST: fix test_mlab.test_griddata_nn failures on Windows
TST: properly fence-post qt{4,5} backend tests
|
I have been doing these locally and then pushing to master, seeing what work-flow of doing maintenance -> master branch merges via PR looks like. On the plus side, we get travis coverage this way, but we will see if it will work twice. |
|
Everything looks good to me. Haven't looked to see what the network graph would look like yet, though. |
|
It should look exactly the same as doing the merge by hand (or my mental On Wed, Oct 7, 2015, 19:43 Benjamin Root notifications@github.com wrote:
|
Merge maintenance branch into master