Skip to content

Stop vendoring sphinx-gallery#9403

Merged
jnothman merged 4 commits intoscikit-learn:masterfrom
amueller:rm_sphinx_gallery
Sep 10, 2017
Merged

Stop vendoring sphinx-gallery#9403
jnothman merged 4 commits intoscikit-learn:masterfrom
amueller:rm_sphinx_gallery

Conversation

@amueller
Copy link
Copy Markdown
Member

@amueller amueller commented Jul 18, 2017

Because sphinx keeps doing incompatible changes which require sphinx_gallery changes to build any docs.
Fixes #9189.

@amueller
Stop vendoring sphinx-gallery
e30cc08 
Because sphinx keeps doing incompatible changes which require sphinx_gallery changes to build any docs.
@TomDLT
Copy link
Copy Markdown
Member

TomDLT commented Jul 18, 2017

Fair enough, I see little benefit to have a fixed version inside scikit-learn
+1

@glemaitre
Copy link
Copy Markdown
Member

glemaitre commented Jul 18, 2017

+1 since the other solution would be to vendor sphinx ;)

@amueller
Copy link
Copy Markdown
Member Author

amueller commented Jul 18, 2017

hm circle seems to have some issues right now? I'd like to confirm this build correctly.

@jnothman
Copy link
Copy Markdown
Member

jnothman commented Jul 19, 2017

Circle's done, but seems to have run a quick build, so no plots: https://12264-843222-gh.circle-artifacts.com/0/home/ubuntu/scikit-learn/doc/_build/html/stable/auto_examples/index.html

1 similar comment
@jnothman
Copy link
Copy Markdown
Member

jnothman commented Jul 19, 2017

Circle's done, but seems to have run a quick build, so no plots: https://12264-843222-gh.circle-artifacts.com/0/home/ubuntu/scikit-learn/doc/_build/html/stable/auto_examples/index.html

@TomDLT
Copy link
Copy Markdown
Member

TomDLT commented Jul 19, 2017

With the plots: https://12279-843222-gh.circle-artifacts.com/0/home/ubuntu/scikit-learn/doc/_build/html/stable/index.html

Some of them ran but failed to produce a plot

@lesteve
Copy link
Copy Markdown
Member

lesteve commented Jul 19, 2017 •
edited
Loading

I am fine with stopping to vendor sphinx-gallery. Small comment: you will need to update the instructions regarding generating the html documentation locally and add pip install sphinx-gallery --upgrade --no-deps (or a variation of it).

@amueller
Copy link
Copy Markdown
Member Author

amueller commented Jul 19, 2017

probably unrelated, but yields

Embedding documentation hyperlinks in examples..
The following HTTP Error has occurred:

404

Also look at these nice errors:

/home/ubuntu/scikit-learn/doc/modules/cross_validation.rst:287: WARNING: undefined label: time_series_cv (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/doc/modules/cross_validation.rst:287: WARNING: undefined label: group_cv (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/doc/modules/gaussian_process.rst:68: WARNING: citation not found: RW2006
/home/ubuntu/scikit-learn/doc/modules/gaussian_process.rst:167: WARNING: citation not found: RW2006
/home/ubuntu/scikit-learn/doc/modules/gaussian_process.rst:190: WARNING: citation not found: RW2006
/home/ubuntu/scikit-learn/doc/modules/gaussian_process.rst:246: WARNING: citation not found: RW2006
/home/ubuntu/scikit-learn/doc/modules/gaussian_process.rst:356: WARNING: citation not found: RW2006
/home/ubuntu/scikit-learn/doc/modules/gaussian_process.rst:541: WARNING: citation not found: RW2006
/home/ubuntu/scikit-learn/sklearn/covariance/outlier_detection.py:docstring of sklearn.covariance.EllipticEnvelope.correct_covariance:4: WARNING: citation not found: Rouseeuw1984
/home/ubuntu/scikit-learn/sklearn/covariance/outlier_detection.py:docstring of sklearn.covariance.EllipticEnvelope.reweight_covariance:4: WARNING: citation not found: Rouseeuw1984
/home/ubuntu/scikit-learn/sklearn/covariance/robust_covariance.py:docstring of sklearn.covariance.MinCovDet.correct_covariance:4: WARNING: citation not found: Rouseeuw1984
/home/ubuntu/scikit-learn/sklearn/covariance/robust_covariance.py:docstring of sklearn.covariance.MinCovDet.reweight_covariance:4: WARNING: citation not found: Rouseeuw1984
/home/ubuntu/scikit-learn/doc/modules/generated/sklearn.linear_model.RandomizedLasso.rst:17: WARNING: undefined label: randomized_l1 (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/sklearn/linear_model/randomized_l1.py:docstring of sklearn.linear_model.RandomizedLasso:25: WARNING: undefined label: randomized_l1 (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/sklearn/linear_model/randomized_l1.py:docstring of sklearn.linear_model.RandomizedLasso:153: WARNING: undefined label: sphx_glr_auto_examples_linear_model_plot_sparse_recovery.py (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/doc/modules/generated/sklearn.linear_model.RandomizedLogisticRegression.rst:17: WARNING: undefined label: randomized_l1 (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/sklearn/linear_model/randomized_l1.py:docstring of sklearn.linear_model.RandomizedLogisticRegression:27: WARNING: undefined label: randomized_l1 (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/sklearn/linear_model/randomized_l1.py:docstring of sklearn.linear_model.RandomizedLogisticRegression:138: WARNING: undefined label: sphx_glr_auto_examples_linear_model_plot_sparse_recovery.py (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/doc/modules/generated/sklearn.linear_model.lasso_stability_path.rst:11: WARNING: undefined label: randomized_l1 (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/sklearn/utils/deprecation.py:docstring of sklearn.linear_model.lasso_stability_path:67: WARNING: undefined label: sphx_glr_auto_examples_linear_model_plot_sparse_recovery.py (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/doc/modules/generated/sklearn.mixture.VBGMM.rst:22: WARNING: undefined label: vbgmm (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/sklearn/model_selection/_search.py:docstring of sklearn.model_selection.GridSearchCV:46: WARNING: undefined label: multivalued_scorer_wrapping (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/sklearn/model_selection/_search.py:docstring of sklearn.model_selection.RandomizedSearchCV:61: WARNING: undefined label: multivalued_scorer_wrapping (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/sklearn/model_selection/_validation.py:docstring of sklearn.model_selection.cross_validate:42: WARNING: undefined label: multivalued_scorer_wrapping (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/sklearn/model_selection/_validation.py:docstring of sklearn.model_selection.permutation_test_score:38: WARNING: undefined label: _scoring_parameter (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/sklearn/model_selection/_validation.py:docstring of sklearn.model_selection.permutation_test_score:38: WARNING: undefined label: _scoring (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/doc/modules/generated/sklearn.neighbors.LSHForest.rst:21: WARNING: undefined label: approximate_nearest_neighbors (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/sklearn/neighbors/lof.py:docstring of sklearn.neighbors.LocalOutlierFactor:78: WARNING: undefined label: sklearn.metrics.pairwise.pairwise_distances (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/doc/modules/grid_search.rst:87: WARNING: undefined label: sphx_glr_auto_examples_model_selection_plot_multi_metric_evaluation (if the link has no caption the label must precede a section header)
/home/ubuntu/scikit-learn/doc/modules/grid_search.rst:186: WARNING: undefined label: sphx_glr_auto_examples_model_selection_plot_multi_metric_evaluation (if the link has no caption the label must precede a section header)

@amueller
Copy link
Copy Markdown
Member Author

amueller commented Sep 8, 2017

@lesteve was that the documentation you meant?

@ogrisel @GaelVaroquaux opinions?

@jnothman
Copy link
Copy Markdown
Member

jnothman commented Sep 10, 2017

Looks good

@jnothman jnothman merged commit 08ec7be into scikit-learn:master Sep 10, 2017
amueller added a commit to amueller/scikit-learn that referenced this pull request Sep 12, 2017
@amueller
MAINT Stop vendoring sphinx-gallery (scikit-learn#9403)
eea56e0
massich pushed a commit to massich/scikit-learn that referenced this pull request Sep 15, 2017
@amueller
MAINT Stop vendoring sphinx-gallery (scikit-learn#9403)
dcdf5e4
amueller added a commit to amueller/scikit-learn that referenced this pull request Sep 19, 2017
@amueller
Don't modify steps in Pipeline.__init__
307c360 
remove outdated comment

fix also for FeatureUnion

[MRG+2] Limiting n_components by both n_features and n_samples instead of just n_features (Recreated PR) (scikit-learn#8742)

[MRG+1] Remove hard dependency on nose (scikit-learn#9670)

MAINT Stop vendoring sphinx-gallery (scikit-learn#9403)

CI upgrade travis to run on new numpy release (scikit-learn#9096)

CI Make it possible to run doctests in .rst files with pytest (scikit-learn#9697)

* doc/datasets/conftest.py to implement the equivalent of nose fixtures
* add conftest.py in root folder to ensure that sklearn local folder
  is used rather than the package in site-packages
* test doc with pytest in Travis
* move custom_data_home definition from nose fixture to .rst file

[MRG+1] avoid integer overflow by using floats for matthews_corrcoef (scikit-learn#9693)

* Fix bug#9622: avoid integer overflow by using floats for matthews_corrcoef

* matthews_corrcoef: cosmetic change requested by jnothman

* Add test_matthews_corrcoef_overflow for Bug#9622

* test_matthews_corrcoef_overflow: clean-up and make deterministic

* matthews_corrcoef: pass dtype=np.float64 to sum & trace instead of using astype

* test_matthews_corrcoef_overflow: add simple deterministic tests

TST Platform independent hash collision tests in FeatureHasher (scikit-learn#9710)

TST More informative error message in test_preserve_trustworthiness_approximately (scikit-learn#9738)

add some rudimentary tests for meta-estimators

fix extra whitespace in error message

add missing if_delegate_has_method in pipeline

don't test tuple pipeline for now

only copy list if not list already? doesn't seem to help?
maskani-moh pushed a commit to maskani-moh/scikit-learn that referenced this pull request Nov 15, 2017
@amueller @maskani-moh
MAINT Stop vendoring sphinx-gallery (scikit-learn#9403)
89b7d06
jwjohnson314 pushed a commit to jwjohnson314/scikit-learn that referenced this pull request Dec 18, 2017
@amueller
MAINT Stop vendoring sphinx-gallery (scikit-learn#9403)
9eca372
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@agramfort agramfort agramfort approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@amueller @TomDLT @glemaitre @jnothman @lesteve @agramfort