Merge 2.x to master #6557

Merged
merged 34 commits into from Jun 8, 2016

Conversation

Projects
None yet
8 participants
Owner

jenshnielsen commented Jun 8, 2016

This didn't merge cleanly so just running it via travis

QuLogic and others added some commits May 29, 2016

@QuLogic QuLogic py3k: Fix print statements in docstrings. 9c586f2
@efiring efiring Merge pull request #6496 from QuLogic/py3k-print-doc
py3k: Fix print statements in docstrings.
7605dd4
@tacaswell tacaswell DOC: make example a bit wider + remove lines 9158c69
@tacaswell tacaswell DOC: update annotation docstrings
 - Annotation class
 - OffsetFrom class
 - Axes.annotate
e89d32d
@tacaswell tacaswell DOC: tweak showcase example f649739
@tacaswell tacaswell DOC: tweak demo a bit
 - use plt.subplots
 - adjust correct spacing
b3c21d3
@tacaswell tacaswell Merge pull request #6481 from jenshnielsen/default-boxplot-style-rebase
API: Default boxplot style
ff98856
@tacaswell tacaswell Merge pull request #6504 from jenshnielsen/patch-issue-6035-rebase
FIX: dpi dependent arrow heads
Conflicts:
	lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.png

Keep version form cherry-pick

Manually backport part of bd63121 which
renamed the test files.
72653f2
@tacaswell tacaswell TST: add small tolerances to streamplot tests
These tests did not backport cleanly from
#6504
374b6c0
@WeatherGod WeatherGod Merge pull request #6506 from tacaswell/tst_tolerance_on_streamplot
TST: add small tolerances to streamplot tests
ef49291
@tacaswell tacaswell REL: v2.0.0b1
First beta release of v2.0.0

This previews the new default style and many bug-fixes.  A full list of
the style changes will be collected for the final release.

In addition to the style change this release includes:
 - overhaul of font handling/text rendering to be faster and clearer
 - many new rcParams
 - Agg based OSX backend
 - optionally deterministic SVGs
 - complete re-write of image handling code
 - simplified color conversion
 - specify colors in the global property cycle via `'C0'`,
   `'C1'`... `'C9'`
 - use the global property cycle more places (bar, stem, scatter)

There is a 'classic' style sheet which reproduces the 1.Y defaults:

   import matplotlib.style as mstyle
   mstyle.use('classic')
06dad9b
@cgohlke cgohlke DOC: remove outdated or duplicate Windows documentation
Windows installers and eggs are no longer provided.
Windows installation instructions are in the INSTALL document.
d54ffdb
@cgohlke cgohlke DOC: Update Windows installation instructions
Matplotlib and all its required dependencies can be installed using pip.
Binaries for Python 3.5 are built with Visual Studio 2015 and include the required C++ runtime files.
Remove references to Python 2.6 and 3.3, as well as Windows installers.
b1f4d68
@cgohlke cgohlke DOC: remove some absolute links in frontpage 4a0d01a
@cgohlke cgohlke DOC: more updates to Windows installation instructions
Update URLs to https. 
Do not let remain double negative.
Fix Sphinx warning.
43ab6c2
@cgohlke cgohlke DOC: fix links to examples ff7e408
@mdboom mdboom Merge pull request #6519 from paulromano/writeraw-fix
Fix FigureCanvasAgg.print_raw(...)
5fbabdf
@efiring efiring Merge pull request #6529 from afvincent/TST_avoid_calling_show_in_tes…
…t_dash_offset

TST Remove plt.show() from test_axes.test_dash_offset
debac32
@tacaswell @tacaswell tacaswell Merge pull request #6522 from phobson/yscales-bxp-demo
DOC: made sure boxplot demos share y-axes
9ebdaed
@zblz @tacaswell zblz Merge pull request #6517 from anntzer/fix-string-gray-conversion
Fix conversion of string grays with alpha.
1e35d8d
@cgohlke cgohlke DOC: not all Sphinx builders support SVG 4bf53ff
@cgohlke cgohlke DOC: add PNG logo 99da366
@cgohlke cgohlke Use 4-space indent a11bdc4
@cgohlke cgohlke Use 4-space indent 5c6295b
@tacaswell tacaswell Merge pull request #6534 from cgohlke/patch-3
Use 4-space indent
43d4c10
@tacaswell tacaswell Merge pull request #6532 from cgohlke/patch-2
DOC: add PNG logo fallback for Shinx builders not supporting SVG
ec276e2
@tacaswell tacaswell Merge pull request #6014 from afvincent/afvincent-patch-issue-6009
FIX: EngFormatter without but without prefix

closes #6009
59e0ab9
@jenshnielsen jenshnielsen Merge pull request #6464 from tacaswell/doc_annotation_docstrings
DOC: update annotation docstrings
80c884a
@tacaswell tacaswell Merge pull request #6508 from cgohlke/patch-1
DOC: Updates for Windows
972266d
@jenshnielsen jenshnielsen Merge pull request #6505 from tacaswell/examples
Examples
36d563b
@WeatherGod WeatherGod Merge pull request #6544 from anntzer/margins-typo
Fix typo in margins handling.
077c72e
@tacaswell tacaswell Merge pull request #5626 from mdboom/new-icons
ENH: New toolbar icons
Conflicts:
	doc/users/navigation_toolbar.rst
	  - kept new wording
	lib/matplotlib/backends/backend_qt5.py
	  - wording + indentation change which is now correct
8356fc2
@jenshnielsen jenshnielsen Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x 1512593
@jenshnielsen jenshnielsen Merge remote-tracking branch 'matplotlib/v2.x'
9cabdc6

mdboom added the needs_review label Jun 8, 2016

@jenshnielsen jenshnielsen merged commit 846758b into matplotlib:master Jun 8, 2016

2 of 3 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.003%) to 69.643%
Details

jenshnielsen deleted the jenshnielsen:2xmaster branch Jun 8, 2016

QuLogic added this to the 2.1 (next point release) milestone Jun 8, 2016

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