Remove doctype from search #5121
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I just tested this with sphinx and mkdocs, everything built normally. |
stsewd
commented
Jan 16, 2019
| self.conf_dir(version), | ||
| '_build', 'json' | ||
| ) | ||
| return json_path |
There was a problem hiding this comment.
So, this is called from process_all_json_files
And is used in os.walk, if the path doesn't exists (mkdocs for example), it doesn't raise an error, it just returns an empty iterator.
stsewd
commented
Jan 16, 2019
| @@ -1350,7 +1344,8 @@ def sync_callback(_, version_pk, commit, *args, **kwargs): | |||
| The first argument is the result from previous tasks, which we discard. | |||
| """ | |||
| fileify(version_pk, commit=commit) | |||
| update_search(version_pk, commit=commit) | |||
| if kwargs.get('search'): | |||
There was a problem hiding this comment.
This shouldn't be needed bc the search code was updated too, but just in case.
|
I will try and test this locally, but it looks good at first look. |
ericholscher
approved these changes
Jan 22, 2019
readthedocs/projects/tasks.py
Outdated
| @@ -741,6 +741,7 @@ def update_app_instances( | |||
| callback=sync_callback.s( | |||
| version_pk=self.version.pk, | |||
| commit=self.build['commit'], | |||
| kwargs={'search': search}, | |||
There was a problem hiding this comment.
This is ending up:
> /Users/eric/projects/readthedocs.org/readthedocs/projects/tasks.py(1395)sync_callback()
1394 import ipdb; ipdb.set_trace()
-> 1395 if kwargs.get('search'):
1396 update_search(version_pk, commit=commit)
ipdb> kwargs
{'kwargs': {'search': True}}
|
Woops. Also ended up pushing my #5150 since I had to have it to test the branch. After that is merged, this should look normal again :) |
ericholscher
force-pushed
the
remove-doctype-from-search
branch
from
23e4e61 to
7417e7c
Compare
ericholscher
force-pushed
the
remove-doctype-from-search
branch
from
45bf9f8 to
9d9947a
Compare
|
Mergable when tests pass 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I still want to test this, I'm going to set up ES later.
Related #4896 (review)