X Tutup
Skip to content

merge fill_demo and fill_demo_features#8154

Merged
NelleV merged 4 commits intomatplotlib:masterfrom
patniharshit:lineBarMarkerMerge
Mar 8, 2017
Merged

merge fill_demo and fill_demo_features#8154
NelleV merged 4 commits intomatplotlib:masterfrom
patniharshit:lineBarMarkerMerge

Conversation

@patniharshit
Copy link
Copy Markdown
Contributor

refs #7956

@@ -1,13 +1,13 @@
import numpy as np
import matplotlib.pyplot as plt
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@dstansby dstansby changed the title merge fill_demo and fill_demo_features [MRG + 1] merge fill_demo and fill_demo_features Feb 26, 2017
@dstansby dstansby added this to the 2.0.1 (next bug fix release) milestone Feb 26, 2017
plt.show()

"""
========================
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@@ -16,3 +16,22 @@
ax.fill(x, y, zorder=10)
ax.grid(True, zorder=5)
plt.show()
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove; there's one at the end.

@NelleV
Copy link
Copy Markdown
Member

NelleV commented Mar 8, 2017

Thanks @patniharshit !

@NelleV NelleV merged commit f032c51 into matplotlib:master Mar 8, 2017
@patniharshit patniharshit deleted the lineBarMarkerMerge branch March 8, 2017 07:20
@QuLogic QuLogic modified the milestones: 2.1 (next point release), 2.0.1 (next bug fix release) Mar 20, 2017
@QuLogic QuLogic changed the title [MRG + 1] merge fill_demo and fill_demo_features merge fill_demo and fill_demo_features Mar 20, 2017
@anntzer anntzer mentioned this pull request Aug 31, 2017
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

X Tutup