/matplotlib

merge fill_demo and fill_demo_features #8154

Merged
merged 4 commits into from Mar 8, 2017
+17 −25

Conversation

Reviewers

@QuLogic QuLogic

@dstansby dstansby

Assignees
No one assigned
Labels
Documentation
Projects
None yet
Milestone
  2.1 (next point r...
4 participants
@patniharshit @NelleV @QuLogic @dstansby
@patniharshit
Contributor

patniharshit commented Feb 26, 2017

refs #7956
@patniharshit patniharshit merge fill_demo and fill_demo_features

All checks have passed

2 successful checks
continuous-integration/appveyor/pr — AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
efb2999
examples/lines_bars_and_markers/fill_demo.py
@@ -1,13 +1,13 @@
+import numpy as np
+import matplotlib.pyplot as plt
@dstansby

dstansby Feb 26, 2017

Contributor

Could the import lines be just below the title (as in the original file)? Otherwise this looks good if the tests pass!

dstansby added the Documentation label Feb 26, 2017

@patniharshit patniharshit move imports below title

All checks have passed

5 successful checks
codecov/patch — Coverage not affected when comparing cb0d97c...728158c
Details
codecov/project/library — 57.96% remains the same compared to cb0d97c
Details
codecov/project/tests — 98.57% (target 97.9%)
Details
continuous-integration/appveyor/pr — AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
728158c

dstansby changed the title from merge fill_demo and fill_demo_features to [MRG + 1] merge fill_demo and fill_demo_features Feb 26, 2017

dstansby added this to the 2.0.1 (next bug fix release) milestone Feb 26, 2017

examples/lines_bars_and_markers/fill_demo.py
@@ -16,3 +16,22 @@
ax.fill(x, y, zorder=10)
ax.grid(True, zorder=5)
plt.show()
@QuLogic

QuLogic Feb 26, 2017

Member

Remove; there's one at the end.

examples/lines_bars_and_markers/fill_demo.py
@@ -16,3 +16,22 @@
ax.fill(x, y, zorder=10)
ax.grid(True, zorder=5)
plt.show()
+
+"""
+========================
@QuLogic

QuLogic Feb 26, 2017

Member

You need to merge these two docstrings into something coherent at the beginning of the file. Just smooshing the separate files together is no good.

@patniharshit

patniharshit Feb 27, 2017

Contributor

Please review.
I was kinda sleepy, messed up commit message XD

patniharshit and others added some commits Feb 27, 2017

@patniharshit patniharshit Merge docstring coherent

Some checks were not successful

2 failing and 3 successful checks
codecov/project/library — 57.9% (-0.06%) compared to cb0d97c
Details
continuous-integration/appveyor/pr — AppVeyor build failed
Details
codecov/patch — Coverage not affected when comparing cb0d97c...71b82a2
Details
codecov/project/tests — 98.56% (target 97.9%)
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
71b82a2
@NelleV NelleV DOC removed redundant call to plt.show()

All checks have failed

2 errored checks
continuous-integration/appveyor/pr — AppVeyor build cancelled
Details
continuous-integration/travis-ci/pr — The Travis CI build could not complete due to an error
Details
b4c8140
@NelleV
Contributor

NelleV commented Mar 8, 2017

Thanks @patniharshit !

@NelleV NelleV merged commit f032c51 into matplotlib:master Mar 8, 2017
0 of 2 checks passed

0 of 2 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

patniharshit deleted the patniharshit:lineBarMarkerMerge branch Mar 8, 2017

@QuLogic QuLogic modified the milestone: 2.1 (next point release), 2.0.1 (next bug fix release) Mar 20, 2017

QuLogic changed the title from [MRG + 1] merge fill_demo and fill_demo_features to merge fill_demo and fill_demo_features Mar 20, 2017

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