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.

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

Merge 2.x to master #6557

Merged
merged 34 commits into from Jun 8, 2016
Merged

Merge 2.x to master #6557

merged 34 commits into from Jun 8, 2016

Conversation

jenshnielsen
Copy link
Member

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

QuLogic and others added 30 commits May 28, 2016 22:06
py3k: Fix print statements in docstrings.
 - Annotation class
 - OffsetFrom class
 - Axes.annotate
 - use plt.subplots
 - adjust correct spacing
…-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.
These tests did not backport cleanly from
matplotlib#6504
…reamplot

TST: add small tolerances to streamplot tests
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')
Windows installers and eggs are no longer provided.
Windows installation instructions are in the INSTALL document.
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.
Update URLs to https. 
Do not let remain double negative.
Fix Sphinx warning.
…how_in_test_dash_offset

TST Remove plt.show() from test_axes.test_dash_offset
DOC: made sure boxplot demos share y-axes
…rsion

Fix conversion of string grays with alpha.
DOC: add PNG logo fallback for Shinx builders not supporting SVG
…ue-6009

FIX: EngFormatter without but without prefix

closes matplotlib#6009
…trings

DOC: update annotation docstrings
WeatherGod and others added 4 commits June 7, 2016 12:30
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
@jenshnielsen jenshnielsen merged commit 846758b into matplotlib:master Jun 8, 2016
@jenshnielsen jenshnielsen deleted the 2xmaster branch June 8, 2016 17:09
@QuLogic 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants