/matplotlib

Mergev2.x to master #6733

Merged
merged 19 commits into from Jul 13, 2016

Conversation

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

tacaswell commented Jul 13, 2016

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

jenshnielsen and others added some commits Jun 12, 2016

@jenshnielsen jenshnielsen Depend on subprocess32 on posix systems for python27 
And use it in plase of subprocess on posix systems.
 2f94956
@jenshnielsen jenshnielsen Remove no longer needed workaround for subprocess pre 2.7 67d26aa
@jenshnielsen jenshnielsen No longer relevant comment 5accdc9
@jenshnielsen jenshnielsen Fix comments
4b36ce4
@tacaswell tacaswell TST: remove rouge print statement b23460b
@tacaswell tacaswell TST: add missing decorator 57fc152
@tacaswell tacaswell TST: add test for CFF / OTF files 
follow up to #6714
9b2a886
@tacaswell tacaswell MNT: use _get_data_path is cbook 
At request of fedora package maintainers.

closes #6536
762d895
@tacaswell tacaswell Merge pull request #6711 from Kojoley/fix-ghostscript-dependency-check 
ENH: Added support for `mgs` to Ghostscript dependecy checker
7f4191b
@tacaswell tacaswell Merge pull request #6703 from phobson/bxp-notch-docs 
DOC: explain behavior of notches beyond quartiles
05d910d
@jenshnielsen jenshnielsen compat/subprocess is now pep8 complient
c4d126f
@jenshnielsen jenshnielsen Merge pull request #6725 from tacaswell/tst_otf 
TST: add test for CFF / OTF files
a2c3344
@jenshnielsen jenshnielsen Merge pull request #6726 from tacaswell/mnt_simplify_get_data 
MNT: use _get_data_path is cbook
890071e
@tacaswell tacaswell Merge pull request #6576 from jenshnielsen/subprocess_changes2 
MNT: Use subprocess32 on python 2.7
1c08c16
@tacaswell tacaswell FIX: do dash scaling early 
When scaling the dash pattern by the linewidth do the scaling at artist
creation / value set time rather than at draw time.

closes #6592
closes #6588
closes #6590
Closes #6693
closes #5430
3ef3f5b
@mdboom mdboom Merge pull request #6710 from tacaswell/fix_refactor_dash_scaling 
FIX: refactor dash scaling
b8698ab
@tacaswell tacaswell REL: v2.0.0b2 
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
be2c5fd
@tacaswell tacaswell DOC: update gh-stats ccd06cb
@tacaswell tacaswell Merge remote-tracking branch 'matplotlib/v2.x' 
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

Some checks were not successful

1 failing and 2 successful checks
continuous-integration/appveyor/pr — AppVeyor build failed
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
coverage/coveralls — Coverage increased (+0.04%) to 70.366%
Details
57d3173

tacaswell added the needs_review label Jul 13, 2016

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
2 of 3 checks passed

2 of 3 checks passed

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

tacaswell removed the needs_review label Jul 13, 2016

tacaswell deleted the tacaswell:mergev2.x_to_master branch Jul 13, 2016

@tacaswell
Owner

tacaswell commented Jul 13, 2016

The appveyor failure is connectivity issues.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment