/matplotlib

Mrg2.0.x #8110

Merged
merged 38 commits into from Feb 20, 2017

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  2.1 (next point r...
8 participants
@tacaswell @dstansby @QuLogic @NelleV @rebot @dopplershift @phobson @afvincent
@tacaswell
Owner

tacaswell commented Feb 20, 2017

Intend to self-merge if CI passes.

Tests pass locally

tacaswell and others added some commits Jan 28, 2017

@tacaswell tacaswell FIX: Restore hatch color tracking edge color
f6b4a32
@tacaswell tacaswell DOC: add whats_new and api_changes entries for gc hatch methods
a58b0d1
@QuLogic QuLogic Fix another datad[cmapname] that didn't exist in master. c2daee2
@QuLogic QuLogic Fix grammar of Vega cmap deprecation message. 
Once all the parameters are substituted into the warning message, it
doesn't make grammatical sense due to some assumptions in the message.
a8a769d
@NelleV NelleV Merge pull request #7986 from QuLogic/fix-cmap-deprecation 
Fix cmap deprecation (again)
fbe562c
@dstansby dstansby Merge pull request #7809 from lkilcher/marker_verts_bug 
Fix for marker verts bug
98a9347
@dstansby dstansby Merge pull request #7997 from anntzer/image-tutorial-cmap 
Default cmap is not jet anymore...
8481bc5
@dstansby dstansby Test 2.0.x on released python 3.6

Some checks were not successful

1 errored and 1 successful checks
continuous-integration/travis-ci/push — The Travis CI build could not complete due to an error
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
ab81f13
@dstansby dstansby Fix broken backported test 936315c
@dstansby dstansby PEP8
6b2e116
@tacaswell tacaswell FIX: do not try to render empty images 
Do not bother trying to render Images which have zero-dimension in any
direction.  Simply return from the `draw` method early

closes #7886
c4700bb
@NelleV NelleV Merge pull request #8004 from dstansby/backport-test-fix 
Fix broken backported test
6727dc6
@QuLogic QuLogic Merge pull request #8000 from matplotlib/testing-3.6-1 
Test 2.0.x on released python 3.6
654b53b
@tacaswell tacaswell DOC: add missing docs for change to Figure.set_size_inches
d9742a4
@NelleV NelleV Merge pull request #8008 from tacaswell/doc_document_set_size_inches_… 
…forward_change

DOC: add missing docs for change to Figure.set_size_inches
493cb8a
@tacaswell tacaswell TST: fix test (turns out it is not a context manager)
48d0ddc
@tacaswell tacaswell FIX: numpy arrays are not 'truthy' 
Check if not None, not the truth value of `self.subs` when setting
up log scales.

closes #8023
3ae2ec9
@QuLogic QuLogic Bump font cache version. 
Due to #7907, the font cache is outdated and should be re-created.
99de4a7
@NelleV NelleV Merge pull request #8025 from tacaswell/fix_log_subs 
FIX: numpy arrays are not 'truthy'
9c031b9
@NelleV NelleV Merge pull request #8029 from QuLogic/fontcache-bump 
Bump font cache version.
af37a47
@tacaswell tacaswell DOC: add missing word
acda4ac
@tacaswell tacaswell MNT: minor tweak to checking size
babdf73
@QuLogic QuLogic Merge pull request #7976 from tacaswell/fix_hatch_color 
FIX: Restore hatch color tracking edge color
d63c95d
@QuLogic QuLogic Merge pull request #8006 from tacaswell/fix_imshow_segfault 
FIX: do not try to render empty images
013fd3f
@tacaswell tacaswell FIX: in errorbar discard any kwargs which have None value 
Passing in `None` is a request from the user to 'do the default
thing', but by keeping the key:value in the kwargs dict it prevents
the default errorbar behavior and falls through to default Line2D
behavior which is likely not what is wanted.

closes #7899
c43f4fd
@tacaswell tacaswell Merge pull request #8033 from shaunwbell/patch-1 
DOC: Update inline comment in set_and_get.py
e5c3cba
@rebot rebot Fixed a small mistake in matplotlibrc.template
9b8b99b
@dopplershift dopplershift Merge pull request #8037 from tacaswell/fix_errorbar_color_cycle 
[MRG+1] FIX: in errorbar discard any kwargs which have None value
dfd1da5
@tacaswell tacaswell Merge pull request #8042 from rebot/patch-1 
FIX: Fixed a small mistake in matplotlibrc.template
f7865d3
@phobson phobson Merge pull request #8070 from heath730/setup_cfg_update 
Switch to suppress option to True in setup.cfg.template.
ac51372
@dstansby dstansby Merge pull request #8084 from jacob-on-github/patch-2 
Add link to scipython book
a347da9
@tacaswell tacaswell Merge pull request #8086 from mitya57/master 
DOC: add SOURCELINK_SUFFIX for compatibility with Sphinx 1.5
1cce7d3
@tacaswell tacaswell API: Remove lw clipping for dash scaling and tweak pattern 
Close #7991
 276e1e9
@tacaswell tacaswell TST: Tests which require updates due to previous commit
c5a59e3
@afvincent afvincent Merge pull request #8032 from tacaswell/api_lw_scale_clipping 
[MRG+2] Api lw scale clipping
2558530
@dstansby dstansby Merge pull request #8094 from patniharshit/keepmiddle 
Remove example of matrix of size (12, 12) and (64, 64)
35996ce
@tacaswell tacaswell Merge remote-tracking branch 'matplotlib/v2.0.0-doc' into v2.0.x
752d6c6
@tacaswell tacaswell Merge remote-tracking branch 'matplotlib/v2.0.x' 
Conflicts:
   .travis.yml
    keep head version of test matrx

   examples/pylab_examples/matshow.py
    whitespace

   lib/matplotlib/__init__.py
    conflicts in list of tests, kept master version

   lib/matplotlib/cm.py
    conflicts in building reveresd color maps
    c2daee2 vs
    14b47ba Kept version on
    master, the deprecation warnings only show up in
    `__getitem__`, not `items`.

    Kept master version

   lib/matplotlib/markers.py
    98a9347 and
    4b7ad54 which are a commit
    and it's backport.  Kept the mater version.

   lib/matplotlib/tests/test_axes.py
    - keep test added in 2.0.x, but remove @cleanup, already used bare asserts
    - discard nose file runner

   lib/matplotlib/tests/test_image.py
    - convert added test to pytest
    - discard nose file runner

   lib/matplotlib/tests/test_marker.py
    - convert added test to pytest
    - discard nose file runner

   lib/matplotlib/tests/test_patches.py
    - discard nose file runner
    - keep tests from master and 2.0.x

   lib/matplotlib/tests/test_scale.py
    keep master version (conflicts due to porting the backport
    of test to nose), same as conflicts in scale.py

All checks have passed

5 successful checks
codecov/patch — 86.66% of diff hit (target 80%)
Details
codecov/project/library — 62.3% (+0.06%) compared to 8241344
Details
codecov/project/tests — 97.97% (target 97.7%)
Details
continuous-integration/appveyor/pr — AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
47fdc32

tacaswell added this to the 2.1 (next point release) milestone Feb 20, 2017

@dstansby
Contributor

dstansby commented Feb 20, 2017

🎉

@dstansby dstansby merged commit e69ea36 into matplotlib:master Feb 20, 2017
5 checks passed

5 checks passed

codecov/patch 86.66% of diff hit (target 80%)
Details
codecov/project/library 62.3% (+0.06%) compared to 8241344
Details
codecov/project/tests 97.97% (target 97.7%)
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

tacaswell deleted the tacaswell:mrg2.0.x branch Feb 20, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment