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

V1.5.x #5207

Merged
merged 18 commits into from Oct 7, 2015
Merged

V1.5.x #5207

merged 18 commits into from Oct 7, 2015

Commits on Oct 3, 2015

  1. Merge pull request #5171 from cgohlke/patch-11

    Fix exception with Pillow 3
    tacaswell committed Oct 3, 2015
    Copy the full SHA
    f39caf1 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2015

  1. Merge pull request #5147 from gcallah/master

    DOC: Cleaned up text in pyplot_tutorial.rst
    tacaswell committed Oct 4, 2015
    Copy the full SHA
    fc27a8e View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    17c9beb View commit details
    Browse the repository at this point in the history
  3. Merge pull request #5181 from jenshnielsen/15backport5178

    Backport DOC: Fix description of draw_markers in api_changes.rst
    jenshnielsen committed Oct 4, 2015
    Copy the full SHA
    d1c6856 View commit details
    Browse the repository at this point in the history
  4. FIX: remove incorrect error checking

    Currently fails with qt5
    tacaswell committed Oct 4, 2015
    Copy the full SHA
    10ef9a7 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2015

  1. Fix encoding for LaTeX

    Instead of a combining acute accent, use a single-codepoint encoding
    jkseppan committed Oct 5, 2015
    Copy the full SHA
    75c0005 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #5192 from jkseppan/latex-doc-1.5

    DOC: Fix encoding for LaTeX
    jenshnielsen committed Oct 5, 2015
    Copy the full SHA
    c8eea31 View commit details
    Browse the repository at this point in the history
  3. Fix ValueError: invalid PNG header on Windows

    On Windows the `urlparse(...).scheme != ''` test for URLs does not work.
    For file names the drive letter is returned as scheme.
    cgohlke authored and WeatherGod committed Oct 5, 2015
    Copy the full SHA
    6107fb5 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    404844c View commit details
    Browse the repository at this point in the history
  5. Merge pull request #5193 from WeatherGod/remove_metafile

    Removes a Mac metafile. Closes #5176
    tacaswell committed Oct 5, 2015
    Copy the full SHA
    eebb481 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #5187 from tacaswell/fix_qt_compat

    FIX: remove incorrect error checking
    jenshnielsen committed Oct 5, 2015
    Copy the full SHA
    522c31c View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2015

  1. TST: properly fence-post qt{4,5} backend tests

    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
    tacaswell committed Oct 6, 2015
    Copy the full SHA
    84aa9f7 View commit details
    Browse the repository at this point in the history
  2. FIX: mro issue with pyside/pyqt4

    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
    tacaswell committed Oct 6, 2015
    Copy the full SHA
    f67ea3c View commit details
    Browse the repository at this point in the history
  3. FIX: be more careful about pyside

    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.
    tacaswell committed Oct 6, 2015
    Copy the full SHA
    cdc52bf View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    d0153b7 View commit details
    Browse the repository at this point in the history
  5. FIX: restore lpy compat

    tacaswell committed Oct 6, 2015
    Copy the full SHA
    ada2f99 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #5184 from cgohlke/patch-14

    TST: fix test_mlab.test_griddata_nn failures on Windows
    WeatherGod committed Oct 6, 2015
    Copy the full SHA
    110e1ed View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2015

  1. Merge pull request #5195 from tacaswell/fix_backend_qt_test

    TST: properly fence-post qt{4,5} backend tests
    jenshnielsen committed Oct 7, 2015
    Copy the full SHA
    c4b9f4e View commit details
    Browse the repository at this point in the history