X Tutup
Skip to content

Mergev2.x to master#6733

Merged
tacaswell merged 19 commits intomatplotlib:masterfrom
tacaswell:mergev2.x_to_master
Jul 13, 2016
Merged

Mergev2.x to master#6733
tacaswell merged 19 commits intomatplotlib:masterfrom
tacaswell:mergev2.x_to_master

Conversation

@tacaswell
Copy link
Copy Markdown
Member

Had to resolve non-trivial merge conflicts, letting travis have a go.

jenshnielsen and others added 19 commits July 11, 2016 19:33
And use it in plase of subprocess on posix systems.
At request of fedora package maintainers.

closes matplotlib#6536
…dency-check

ENH: Added support for `mgs` to Ghostscript dependecy checker
DOC: explain behavior of notches beyond quartiles
TST: add test for CFF / OTF files
When scaling the dash pattern by the linewidth do the scaling at artist
creation / value set time rather than at draw time.

closes matplotlib#6592
closes matplotlib#6588
closes matplotlib#6590
Closes matplotlib#6693
closes matplotlib#5430
Second beta for matplotlib v2.0.0

- fixed bugs in scaling dash pattern by linewidth
- fixed over/under propagating in images
- back ported improved png API from master
- deprecate gtk, gdk, wx (not gtkagg, wxagg) backends
- tweaks to default font sizes
- ensure default ticker always has at least 2 ticks
- remove vendored version of `six`
- updated GUI icons
- many small bug fixes
Conflicts:
	lib/matplotlib/collections.py
	  import conflicts
	lib/matplotlib/lines.py
	   import conflicts
	lib/matplotlib/tests/test_coding_standards.py
	   adjacent lines were removed
	lib/matplotlib/tests/test_font_manager.py
	   multiple tests were added
	setupext.py
	   comments
@tacaswell tacaswell added this to the 2.1 (next point release) milestone Jul 13, 2016
@tacaswell tacaswell merged commit c04e756 into matplotlib:master Jul 13, 2016
@tacaswell tacaswell deleted the mergev2.x_to_master branch July 13, 2016 18:25
@tacaswell
Copy link
Copy Markdown
Member Author

The appveyor failure is connectivity issues.

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.

3 participants

X Tutup