[MRG+1] Fix: Replace pylab with matplotlib.pyplot #6754 #6762

ztultrebor · 2016-05-04T21:41:36Z

Reference Issue

What does this implement/fix? Explain your changes.

multiple instances of occurrences of pylab replaced with matplotlib.pyplot
references to pl ( as in import pylab as pl) replaced
with plt (as in import matplotlib.pyplot as plt)

Any other comments?

one file still contains references to pylab: doc/sphinxext/gen_rst.py
I'd need some time to figure out what needs to be done; closing this for now

- one instance of 22 occurrences of pylab replaced with matplotlib.pyplot - bench_glm.py now free of pylab references - code executes properly

agramfort · 2016-05-05T06:24:08Z

there is only one file changed in this PR so far

- one instance of 21 remaining occurrences of pylab replaced with matplotlib.pyplot - bench_glmnet.py now free of pylab references - code does not execute for extraneous reason: ImportError: No module named glmnet.elastic_net

- one instance of 19 occurrences of pylab replaced with matplotlib.pyplot - bench_lasso.py now free of pylab references - code executes properly

- one instance of 18 occurrences of pylab replaced with matplotlib.pyplot - bench_plot_neighbors.py now free of pylab references - code executes properly

- one instance of 17 occurrences of pylab replaced with matplotlib.pyplot - bench_plot_omp_lars.py now free of pylab references - code does not execute for extraneous reasons: - File "bench_plot_omp_lars.py", line 111, in <module> - ax = fig.add_subplot(1, 2, i) - ValueError: num must be 1 <= num <= 2, not 0 - line 111 should probably be ax = fig.add_subplot(1, 2, i+1)

- bench_plot_parallel_pairwise.py now free of pylab references - code executes properly

- bench_plot_ward.py now free of pylab references - code executes properly

- bench_sgd_regression.py now free of pylab references - code executes properly

- bench_tree.py now free of pylab references - code executes properly

agramfort · 2016-05-08T11:46:39Z

benchmarks/bench_glm.py

@@ -12,7 +12,7 @@

 if __name__ == '__main__':

-    import pylab as pl
+    import matplotlib.pyplot as pl


standard import name is plt

please change all occurrences.

thanks

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_glm.py clean

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_glm.py clean of pl - code does not execute for extraneous reasons

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_lasso.py clean of pl - code executes properly

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_plot_neighbors.py clean of pl - code executes properly

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_plot_omp_lars.py clean of pl - code does not execute for extraneous reasons

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_plot_parallel_pairwise.py clean of pl - code executes properly

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_plot_ward.py clean of pl - code executes properly

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_sgd_regression.py clean of pl - code executes properly

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_tree.py clean of pl - code executes properly

- replaced with matplotlib.pyplot - pl --> plt

ogrisel · 2016-05-09T08:16:30Z

doc/tutorial/statistical_inference/supervised_learning.rst

@@ -212,15 +212,15 @@ induces high variance:
    >>> test = np.c_[ 0, 2].T
    >>> regr = linear_model.LinearRegression()

-    >>> import pylab as pl # doctest: +SKIP
-    >>> pl.figure() # doctest: +SKIP
+    >>> import matplotlib as plt # doctest: +SKIP


typo: matplotlib.pyplot

ogrisel · 2016-05-09T08:19:12Z

Thanks @ztultrebor. Are you done with this PR? If so please change the title from [WIP] to [MRG].

+1 for merge on my side once #6762 (comment) is taken care of.

ztultrebor · 2016-05-09T14:45:09Z

I've still got a few more files to clean up. Once those are taken care of I'll be certain to update the pull title appropriately

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - mlcomp_sparse_document_classification.py clean of pl

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - plot_gpr_noisy_targets.py clean of pl - code does not execute for extraneous reasons - File "examples/gaussian_process/plot_gpr_noisy_targets.py", line 31, in <module> - from sklearn.gaussian_process import GaussianProcessRegressor - ImportError: cannot import name GaussianProcessRegressor

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - plot_gpc_isoprobability.py clean of pl - code does not execute for extraneous reasons - File "examples/gaussian_process/plot_gpc_isoprobability.py", line 24, in <module> - from sklearn.gaussian_process import GaussianProcessClassifier - ImportError: cannot import name GaussianProcessClassifier

- replaced with matplotlib.pyplot - pl --> plt

- replaced with matplotlib.pyplot

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - plot_sparse_coding.py clean of pl - code executes properly

- replaced with matplotlib.pyplot

TomDLT · 2016-05-09T17:06:35Z

benchmarks/bench_plot_neighbors.py

@@ -131,21 +131,21 @@ def barplot_neighbors(Nrange=2 ** np.arange(1, 11),
            xvals = 0.1 + i * (1 + len(vals)) + np.arange(len(vals))
            width = 0.8

-            c_bar = pl.bar(xvals, build_time[alg] - bottom,
+            c_bar = plt.bar(xvals, build_time[alg] - bottom,
                           width, bottom, color='r')


you need to change the indentation here and there, since you added a character

TomDLT · 2016-05-10T09:35:23Z

Thank you @ztultrebor !

…cikit-learn#6762) * Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754 - one instance of 22 occurrences of pylab replaced with matplotlib.pyplot - bench_glm.py now free of pylab references - code executes properly * Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754 - one instance of 21 remaining occurrences of pylab replaced with matplotlib.pyplot - bench_glmnet.py now free of pylab references - code does not execute for extraneous reason: ImportError: No module named glmnet.elastic_net * Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754 - one instance of 19 occurrences of pylab replaced with matplotlib.pyplot - bench_lasso.py now free of pylab references - code executes properly * Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754 - one instance of 18 occurrences of pylab replaced with matplotlib.pyplot - bench_plot_neighbors.py now free of pylab references - code executes properly * Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754 - one instance of 17 occurrences of pylab replaced with matplotlib.pyplot - bench_plot_omp_lars.py now free of pylab references - code does not execute for extraneous reasons: - File "bench_plot_omp_lars.py", line 111, in <module> - ax = fig.add_subplot(1, 2, i) - ValueError: num must be 1 <= num <= 2, not 0 - line 111 should probably be ax = fig.add_subplot(1, 2, i+1) * Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754 - bench_plot_parallel_pairwise.py now free of pylab references - code executes properly * Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754 - bench_plot_ward.py now free of pylab references - code executes properly * Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754 - bench_sgd_regression.py now free of pylab references - code executes properly * Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754 - bench_tree.py now free of pylab references - code executes properly * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_glm.py clean * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_glm.py clean of pl - code does not execute for extraneous reasons * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_lasso.py clean of pl - code executes properly * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_plot_neighbors.py clean of pl - code executes properly * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_plot_omp_lars.py clean of pl - code does not execute for extraneous reasons * fix: Fix bug that prevented graphs from displaying * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_plot_parallel_pairwise.py clean of pl - code executes properly * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_plot_ward.py clean of pl - code executes properly * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_sgd_regression.py clean of pl - code executes properly * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_tree.py clean of pl - code executes properly * docs: removed pylab references from comments * docs: removed all pylab references - replaced with matplotlib.pyplot - pl --> plt * docs: removed pylab references from comments - replaced with matplotlib.pyplot - pl --> plt * docs: removed all pylab references - replaced with matplotlib.pyplot - pl --> plt * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - mlcomp_sparse_document_classification.py clean of pl * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - plot_gpr_noisy_targets.py clean of pl - code does not execute for extraneous reasons - File "examples/gaussian_process/plot_gpr_noisy_targets.py", line 31, in <module> - from sklearn.gaussian_process import GaussianProcessRegressor - ImportError: cannot import name GaussianProcessRegressor * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - plot_gpc_isoprobability.py clean of pl - code does not execute for extraneous reasons - File "examples/gaussian_process/plot_gpc_isoprobability.py", line 24, in <module> - from sklearn.gaussian_process import GaussianProcessClassifier - ImportError: cannot import name GaussianProcessClassifier * docs: removed all pylab references - replaced with matplotlib.pyplot - pl --> plt * docs: removed all pylab references - replaced with matplotlib.pyplot * refactor: Replace pl with plt - replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - plot_sparse_coding.py clean of pl - code executes properly * docs: removed all pylab references - replaced with matplotlib.pyplot * docs: removed all pylab references - replaced with matplotlib.pyplot * style: Indent properly * style: indent properly * style: Indent properly * docs: Add missing .pyplot * docs: Fix typo * style: Indent properly

…earn#7846

Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754

59c4209

- one instance of 22 occurrences of pylab replaced with matplotlib.pyplot - bench_glm.py now free of pylab references - code executes properly

ztultrebor added 8 commits May 5, 2016 19:41

Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754

0e08eab

- one instance of 21 remaining occurrences of pylab replaced with matplotlib.pyplot - bench_glmnet.py now free of pylab references - code does not execute for extraneous reason: ImportError: No module named glmnet.elastic_net

Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754

0ac6c7d

- one instance of 19 occurrences of pylab replaced with matplotlib.pyplot - bench_lasso.py now free of pylab references - code executes properly

Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754

e8f9efc

- one instance of 18 occurrences of pylab replaced with matplotlib.pyplot - bench_plot_neighbors.py now free of pylab references - code executes properly

Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754

361957f

- bench_plot_parallel_pairwise.py now free of pylab references - code executes properly

Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754

28c946b

- bench_plot_ward.py now free of pylab references - code executes properly

Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754

9e40520

- bench_sgd_regression.py now free of pylab references - code executes properly

Fix: Replace pylab with matplotlib.pyplot scikit-learn#6754

41bb999

- bench_tree.py now free of pylab references - code executes properly

agramfort reviewed May 8, 2016
View reviewed changes

ztultrebor added 14 commits May 8, 2016 18:46

refactor: Replace pl with plt

5c2e9f5

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_glm.py clean

refactor: Replace pl with plt

a4c2692

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_glm.py clean of pl - code does not execute for extraneous reasons

refactor: Replace pl with plt

86533f8

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_lasso.py clean of pl - code executes properly

refactor: Replace pl with plt

531b770

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_plot_neighbors.py clean of pl - code executes properly

refactor: Replace pl with plt

f3276aa

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_plot_omp_lars.py clean of pl - code does not execute for extraneous reasons

fix: Fix bug that prevented graphs from displaying

57126a1

refactor: Replace pl with plt

3cd9786

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_plot_parallel_pairwise.py clean of pl - code executes properly

refactor: Replace pl with plt

22bb3b8

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_plot_ward.py clean of pl - code executes properly

refactor: Replace pl with plt

5868f4b

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_sgd_regression.py clean of pl - code executes properly

refactor: Replace pl with plt

9fb5290

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - bench_tree.py clean of pl - code executes properly

docs: removed pylab references from comments

2df3acd

docs: removed all pylab references

9df9225

- replaced with matplotlib.pyplot - pl --> plt

docs: removed pylab references from comments

82c08ac

- replaced with matplotlib.pyplot - pl --> plt

docs: removed all pylab references

32d574e

- replaced with matplotlib.pyplot - pl --> plt

ogrisel reviewed May 9, 2016
View reviewed changes

ztultrebor added 2 commits May 9, 2016 10:54

refactor: Replace pl with plt

4f0bb78

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - mlcomp_sparse_document_classification.py clean of pl

ztultrebor added 6 commits May 9, 2016 11:04

docs: removed all pylab references

2582513

- replaced with matplotlib.pyplot - pl --> plt

docs: removed all pylab references

918ed58

- replaced with matplotlib.pyplot

refactor: Replace pl with plt

af26318

- replace instances of pl (as on import pylab as pl) with plt (as in import matplotlib.pyplot as plt) - plot_sparse_coding.py clean of pl - code executes properly

docs: removed all pylab references

45514ee

- replaced with matplotlib.pyplot

docs: removed all pylab references

93482ad

- replaced with matplotlib.pyplot

ztultrebor changed the title ~~[WIP] Fix: Replace pylab with matplotlib.pyplot #6754~~ [MRG] Fix: Replace pylab with matplotlib.pyplot #6754 May 9, 2016

TomDLT reviewed May 9, 2016
View reviewed changes

ztultrebor added 6 commits May 9, 2016 22:33

style: Indent properly

0f82942

style: indent properly

4095006

style: Indent properly

fd9407e

docs: Add missing .pyplot

6ad9fc6

docs: Fix typo

d327902

style: Indent properly

040b365

ogrisel changed the title ~~[MRG] Fix: Replace pylab with matplotlib.pyplot #6754~~ [MRG+1] Fix: Replace pylab with matplotlib.pyplot #6754 May 10, 2016

TomDLT merged commit 0c879ba into scikit-learn:master May 10, 2016

TomDLT mentioned this pull request May 10, 2016

Potential error in beginner's tutorial #6751

Closed

trevorstephens added a commit to trevorstephens/scikit-learn that referenced this pull request Jul 26, 2017

rebase and catch up to scikit-learn#6762, scikit-learn#7673, scikit-l…

e5dc8eb

…earn#7846

trevorstephens added a commit to trevorstephens/scikit-learn that referenced this pull request Aug 12, 2017

rebase and catch up to scikit-learn#6762, scikit-learn#7673, scikit-l…

10fa1bd

…earn#7846

trevorstephens added a commit to trevorstephens/scikit-learn that referenced this pull request May 25, 2018

rebase and catch up to scikit-learn#6762, scikit-learn#7673, scikit-l…

152a190

…earn#7846

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MRG+1] Fix: Replace pylab with matplotlib.pyplot #6754 #6762

[MRG+1] Fix: Replace pylab with matplotlib.pyplot #6754 #6762

ztultrebor commented May 4, 2016 •

edited by TomDLT

Loading

agramfort commented May 5, 2016

agramfort May 8, 2016

ogrisel May 9, 2016

ogrisel commented May 9, 2016

ztultrebor commented May 9, 2016

TomDLT May 9, 2016

TomDLT commented May 10, 2016

[MRG+1] Fix: Replace pylab with matplotlib.pyplot #6754 #6762

[MRG+1] Fix: Replace pylab with matplotlib.pyplot #6754 #6762

Conversation

ztultrebor commented May 4, 2016 • edited by TomDLT Loading

Reference Issue

What does this implement/fix? Explain your changes.

Any other comments?

agramfort commented May 5, 2016

agramfort May 8, 2016

Choose a reason for hiding this comment

ogrisel May 9, 2016

Choose a reason for hiding this comment

ogrisel commented May 9, 2016

ztultrebor commented May 9, 2016

TomDLT May 9, 2016

Choose a reason for hiding this comment

TomDLT commented May 10, 2016

ztultrebor commented May 4, 2016 •

edited by TomDLT

Loading