Skip to content

Mrg2.0.x #8110

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

Merged
merged 38 commits into from
Feb 20, 2017
Merged

Mrg2.0.x #8110

merged 38 commits into from
Feb 20, 2017

Conversation

tacaswell
Copy link
Member

Intend to self-merge if CI passes.

Tests pass locally

tacaswell and others added 30 commits January 29, 2017 13:49
Once all the parameters are substituted into the warning message, it
doesn't make grammatical sense due to some assumptions in the message.
Do not bother trying to render Images which have zero-dimension in any
direction.  Simply return from the `draw` method early

closes matplotlib#7886
…ze_inches_forward_change

DOC: add missing docs for change to Figure.set_size_inches
Check if not None, not the truth value of `self.subs` when setting
up log scales.

closes matplotlib#8023
Due to matplotlib#7907, the font cache is outdated and should be re-created.
FIX: Restore hatch color tracking edge color
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 matplotlib#7899
DOC: Update inline comment in set_and_get.py
…cycle

[MRG+1] FIX: in errorbar discard any kwargs which have None value
FIX: Fixed a small mistake in matplotlibrc.template
Switch to suppress option to True in setup.cfg.template.
dstansby and others added 8 commits February 16, 2017 21:58
DOC: add SOURCELINK_SUFFIX for compatibility with Sphinx 1.5
Remove example of matrix of size (12, 12) and (64, 64)
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
@tacaswell tacaswell added this to the 2.1 (next point release) milestone Feb 20, 2017
@dstansby
Copy link
Member

🎉

@dstansby dstansby merged commit e69ea36 into matplotlib:master Feb 20, 2017
@tacaswell tacaswell deleted the mrg2.0.x branch February 20, 2017 21:34
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.

8 participants