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.

Sign up for GitHub

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

Jump to bottom

Merge 2.x to master #6356

Merged
merged 21 commits into from May 1, 2016
Merged

Merge 2.x to master #6356

merged 21 commits into from May 1, 2016

Commits on Apr 3, 2016

  1. Merge pull request matplotlib#6263 from tacaswell/tst_skip_float_roun… 

    …ding_issue_test

TST: skip broken test
    @jenshnielsen
    jenshnielsen committed Apr 3, 2016
    Configuration menu
    Copy the full SHA
    44e7356 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2016

  1. A feeble attempt to plug a theoretical security hole

    @WeatherGod
    WeatherGod committed Apr 6, 2016
    Configuration menu
    Copy the full SHA
    b67deca View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2016

  1. FIX: use b'' when escaping array as strings in ps 

    The function quote_ps_string is used to sanitize the result of
np.tostring (which really returns bytes) to make sure no 'special'
ps characters make it through.

We were trying to use unicode to replace in a byte string

We also need to decode bytes to unicode to put the string into the
ps file.

closes matplotlib#6226
    @tacaswell
    tacaswell committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    97953f3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request matplotlib#6282 from tacaswell/fix_ps_string_escaping 

    FIX: use b'' when escaping array as strings in ps
    @mdboom
    mdboom committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    56dd604 View commit details
    Browse the repository at this point in the history

  3. Merge pull request matplotlib#6267 from efiring/scatter-color 

    MNT: trap inappropriate use of color kwarg in scatter; closes matplotlib#6266
    @WeatherGod
    WeatherGod committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    1f1b8b8 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2016

  1. Merge pull request matplotlib#6300 from mdboom/linewidth 

    Remake of matplotlib#6286
    @mdboom
    mdboom committed Apr 14, 2016
    Configuration menu
    Copy the full SHA
    b6e0b9b View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2016

  1. Merge pull request matplotlib#6274 from WeatherGod/plug_hole 

    FIX: plug a theoretical security hole
    @tacaswell
    tacaswell committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    d5d694b View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2016

  1. Merge pull request matplotlib#6311 from egpbos/seaborn_sheets 

    FIX: Seaborn sheets
    @tacaswell
    tacaswell committed Apr 18, 2016
    Configuration menu
    Copy the full SHA
    d16c258 View commit details
    Browse the repository at this point in the history

  2. Merge pull request matplotlib#6241 from anntzer/qt5-validator-locale 

    Force Qt validator to use C locale.
    @tacaswell
    tacaswell committed Apr 18, 2016
    Configuration menu
    Copy the full SHA
    c1cd4f2 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2016

  1. Merge pull request matplotlib#6314 from henningpohl/patch-1 

    Only render markers on a line when markersize > 0
    @tacaswell
    tacaswell committed Apr 20, 2016
    Configuration menu
    Copy the full SHA
    38d9638 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2016

  1. MNT: be explicitly strict in FunctionAnimation 

    If the user functions return None, raise RuntimeError.

Suggested in matplotlib#6332
    @tacaswell
    tacaswell committed Apr 26, 2016
    Configuration menu
    Copy the full SHA
    65507a0 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2016

  1. Merge pull request matplotlib#6336 from tacaswell/mnt_stricter_animation 

    MNT: be explicitly strict in FunctionAnimation
    @dopplershift
    dopplershift committed Apr 27, 2016
    Configuration menu
    Copy the full SHA
    7cb9d1f View commit details
    Browse the repository at this point in the history

  2. Merge pull request matplotlib#6340 from tacaswell/bld_update_cycler_dep 

    BLD: make minimum cycler version 0.10.0
    @WeatherGod
    WeatherGod committed Apr 27, 2016
    Configuration menu
    Copy the full SHA
    9f83d53 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2016

  1. API/ENH: Color cycle handling 

    API/ENH: Color cycle handling
    @tacaswell
    tacaswell committed Apr 28, 2016
    Configuration menu
    Copy the full SHA
    e524354 View commit details
    Browse the repository at this point in the history

  2. Merge pull request matplotlib#6253 from madphysicist/ticker-formatter… 

    …-maint

MAINT: Updates to formatters in `matplotlib.ticker`
Conflicts:
	.mailmap
	  - just added the 1 new line, did not change any others
	lib/matplotlib/tests/test_ticker.py
	  - whitespace vs new tests
    @tacaswell
    tacaswell committed Apr 28, 2016
    Configuration menu
    Copy the full SHA
    668f292 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2016

  1. Merge pull request matplotlib#6328 from benjamincongdon/ft-scatter-ma… 

    …rker-rc

Add default scatter marker option to rcParams
    @tacaswell
    tacaswell committed Apr 29, 2016
    Configuration menu
    Copy the full SHA
    ad81e3f View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2016

  1. Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x

    @tacaswell
    tacaswell committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    360b2f7 View commit details
    Browse the repository at this point in the history

  2. Linkchecker uses requests but is broken with requests 2.10.0 so force… 

    … an earlier version
    @jenshnielsen
    jenshnielsen committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    482ddad View commit details
    Browse the repository at this point in the history

  3. Merge pull request matplotlib#6351 from jenshnielsen/fixlinkcheck 

    Fix link check in docs build
    @tacaswell
    tacaswell committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    d56d544 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2016

  1. Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x

    @tacaswell
    tacaswell committed May 1, 2016
    Configuration menu
    Copy the full SHA
    e63dff6 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'matplotlib/v2.x'

    @jenshnielsen
    jenshnielsen committed May 1, 2016
    Configuration menu
    Copy the full SHA
    e6ebf8e View commit details
    Browse the repository at this point in the history