/matplotlib

Merge 2.x to master #7026

Merged
merged 30 commits into from Sep 5, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  2.1 (next point r...
3 participants
@efiring @tacaswell @QuLogic
@efiring
Owner

efiring commented Sep 5, 2016

There were 3 conflicts, so I am using a PR for this merge to allow more checking.

tacaswell and others added some commits Aug 27, 2016

@tacaswell tacaswell DOC: merge api changes into main api_changes.rst bb775aa
@tacaswell tacaswell DOC: move whats_new files into main whats_new.rst 7314c90
@tacaswell tacaswell DOC: merge the rcparams sections 0d4c84a
@tacaswell tacaswell DOC: document 'CN' pattern of naming colors 4be1c14
@tacaswell tacaswell DOC: fix rst 7a6429e
@tacaswell tacaswell WIP: split up whats_new 19a96c1
@tacaswell tacaswell FIX: correct name of seaborn stylesheet 628f4c1
@tacaswell tacaswell DOC: work on color documentation fa4fbe1
@tacaswell tacaswell DOC: minor changes to old whats_new b314fbb
@tacaswell tacaswell DOC: move style change documentation around a bit 97b0574
@tacaswell tacaswell DOC: start to re-arrange top-level organization 39636b0
@tacaswell tacaswell DOC: yet more re-organization / consolidation cdc11fe
@tacaswell tacaswell FIX: properly rename seaborn style sheet 534778f
@tacaswell tacaswell DOC: update colormap section 251ae73
@tacaswell tacaswell DOC: fix adornments ee0d3e2
@tacaswell tacaswell DOC: clean up API changes a bit 7652e40
@tacaswell tacaswell DOC: yet more work on new defaults f1753b7
@tacaswell tacaswell API: add `lines.scale_dashes` rcParam 
This is something that we probably want to expose as a knob without
forcing full classic mode.

Closes #6998
 b11d170
@tacaswell tacaswell FIX: matplotlibrc.template to match rcsetup 
Both set to {'lines.dotted_pattern': [1.1, 1.1]}
 6f43449
@tacaswell tacaswell DOC: add section on `plot` b6e9648
@tacaswell tacaswell DOC: edits colors.rst 
 - use https
 - improve language
 - correct stale text

@efiring and @qulogic
 dbab147
@tacaswell tacaswell DOC: minor wording / punctuation changes ce9243e
@QuLogic @tacaswell QuLogic DOC: Fix small issues in new release notes. f81a08d
@tacaswell tacaswell DOC: add patch section 1aaa2c0
@tacaswell tacaswell DOC: add section on dpi / figure size / font size d925fff
@tacaswell tacaswell DOC: yet more doc changes
89add4c
@efiring @tacaswell efiring DOC: cleanups in api_changes for v1.5 and later
6d97f09
@efiring efiring Merge pull request #6994 from tacaswell/doc_v2_release_notes 
Doc v2 release notes
a569f11
@efiring efiring Merge branch 'v2.x' into master_merge

Some checks were not successful

1 errored, 1 failing, and 1 successful checks
continuous-integration/appveyor/pr — AppVeyor build cancelled
Details
continuous-integration/travis-ci/pr — The Travis CI build failed
Details
coverage/coveralls — Coverage remained the same at 70.368%
Details
55e90bd

efiring added the needs_review label Sep 5, 2016

@tacaswell
Owner

tacaswell commented Sep 5, 2016

I merged style_sheets.rst into customizing.rst, it looks like style_sheets.rst got resurected?
@efiring
Owner

efiring commented Sep 5, 2016

Yes, I misinterpreted the situation. I will re-kill style_sheets.rst.
@efiring efiring Remove style_sheets.rst, erroneously resurrected in the merge.

Some checks were not successful

1 failing and 2 successful checks
continuous-integration/travis-ci/pr — The Travis CI build failed
Details
continuous-integration/appveyor/pr — AppVeyor build succeeded
Details
coverage/coveralls — Coverage increased (+0.002%) to 70.37%
Details
cc07e88
@efiring
Owner

efiring commented Sep 5, 2016

Two failures: a sphinx problem in an old whats_new in the docs, and one svg image comparison failure in the pytest build (/home/travis/build/matplotlib/matplotlib/result_images/test_mplot3d/mixedsubplot.svg).
@tacaswell
Owner

tacaswell commented Sep 5, 2016

I have fixed the reference and re-started the pytest run (that smelled like a transient to me). If the svg failure is transient I will push this + my extra commit to fix the ref directly to master.

@tacaswell tacaswell merged commit cc07e88 into matplotlib:master Sep 5, 2016
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
coverage/coveralls Coverage increased (+0.002%) to 70.37%
Details

tacaswell removed the needs_review label Sep 5, 2016

QuLogic added this to the 2.1 (next point release) milestone Sep 6, 2016

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