Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove our mkdocs search override #3496

Merged
merged 4 commits into from Jan 11, 2018
Merged

Remove our mkdocs search override #3496

merged 4 commits into from Jan 11, 2018

Conversation

@ericholscher
Copy link
Member

@ericholscher ericholscher commented Jan 9, 2018

This removes the JSON build on mkdocs,
as this has been removed from mkdocs,
so we should stop running it.

It will fix the error here: http://readthedocs.org/projects/mkdocs/builds/6503359/

It also fixes the search so that it uses mkdocs builtin search, instead of our own broken search for mkdocs. This is a temporary fix, but will at least make search work.

ericholscher added 2 commits Jan 9, 2018
This has been removed from mkdocs,
so we should stop running it.

It will fix the error here: http://readthedocs.org/projects/mkdocs/builds/6503359/
@ericholscher ericholscher changed the title Add david to Dev team listing Stop running Mkdocs JSON builder Jan 9, 2018
@ericholscher ericholscher changed the title Stop running Mkdocs JSON builder Remove our mkdocs search override Jan 9, 2018
@ericholscher ericholscher requested review from humitos and agjohnson Jan 9, 2018
Copy link
Member

@humitos humitos left a comment

LGTM. I just left a minor comment. Check the conflicts on the js file.

I didn't test the mkdocs builtin search (not the search itself, but that the url of the form is correct for example). I suppose that you did and work :)

This is a temporary fix, but will at least make search work.

We should create an issue to track this: go back to our better mkdocs search engine, at some point.

@@ -10,6 +10,6 @@ $(document).ready(function () {
footer.init();
sphinx.init();
// grokthedocs.init();
mkdocs.init();
// mkdocs.init();
Copy link
Member

@humitos humitos Jan 11, 2018

Since we are not using it we can also comment line 4 (require)

@ericholscher
Copy link
Member Author

@ericholscher ericholscher commented Jan 11, 2018

There's already a million tickets about mkdocs search not being great. They removed the json command that we were using for search on our side, so I'm not sure if "proper" search for mkdocs is going to happen.

@humitos
Copy link
Member

@humitos humitos commented Jan 11, 2018

@ericholscher
Copy link
Member Author

@ericholscher ericholscher commented Jan 11, 2018

Their own search works fine, thats what this PR is for :)

@humitos
Copy link
Member

@humitos humitos commented Jan 11, 2018

@ericholscher ericholscher merged commit 735d630 into master Jan 11, 2018
1 check passed
@stsewd stsewd deleted the stop-running-mkdocs-json branch Aug 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants