Skip to content

Commit 8ba9e1a

Browse files
committed
Update pre-commit and styles
This style corresponds to PR #3559
1 parent 37d97c0 commit 8ba9e1a

File tree

3 files changed

+132
-88
lines changed

3 files changed

+132
-88
lines changed

.pre-commit-config.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ exclude: '^$'
22
fail_fast: false
33
repos:
44
- repo: [email protected]:pre-commit/pre-commit-hooks
5-
sha: v1.1.1
5+
sha: v1.2.0
66
hooks:
77
- id: autopep8-wrapper
88
- id: check-added-large-files
@@ -30,7 +30,7 @@ repos:
3030
- id: trailing-whitespace
3131

3232
- repo: [email protected]:pre-commit/mirrors-yapf.git
33-
sha: v0.20.0
33+
sha: v0.20.1
3434
hooks:
3535
- id: yapf
3636
exclude: 'migrations|settings|scripts'
@@ -56,9 +56,10 @@ repos:
5656
args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable']
5757

5858
- repo: git://github.com/guykisel/prospector-mirror
59-
sha: 'b27f281eb9398fc8504415d7fbdabf119ea8c5e1'
59+
sha: b27f281eb9398fc8504415d7fbdabf119ea8c5e1
6060
hooks:
6161
- id: prospector
6262
# https://github.com/pre-commit/pre-commit/issues/178
6363
language: system
64+
files: '\.py$'
6465
args: ['--profile=prospector']

readthedocs/restapi/utils.py

Lines changed: 69 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
# -*- coding: utf-8 -*-
12
"""Utility functions that are used by both views and celery tasks."""
23

3-
from __future__ import absolute_import
4+
from __future__ import (
5+
absolute_import, division, print_function, unicode_literals)
6+
47
import hashlib
58
import logging
69

@@ -33,14 +36,17 @@ def sync_versions(project, versions, type): # pylint: disable=redefined-builtin
3336
else:
3437
# Update slug with new identifier
3538
Version.objects.filter(
36-
project=project, verbose_name=version_name
37-
).update(
38-
identifier=version_id,
39-
type=type,
40-
machine=False,
39+
project=project, verbose_name=version_name).update(
40+
identifier=version_id,
41+
type=type,
42+
machine=False,
43+
) # noqa
44+
45+
log.info(
46+
'(Sync Versions) Updated Version: [%s=%s] ',
47+
version['verbose_name'],
48+
version['identifier'],
4149
)
42-
log.info("(Sync Versions) Updated Version: [%s=%s] ",
43-
version['verbose_name'], version['identifier'])
4450
else:
4551
# New Version
4652
created_version = Version.objects.create(
@@ -51,7 +57,7 @@ def sync_versions(project, versions, type): # pylint: disable=redefined-builtin
5157
)
5258
added.add(created_version.slug)
5359
if added:
54-
log.info("(Sync Versions) Added Versions: [%s] ", ' '.join(added))
60+
log.info('(Sync Versions) Added Versions: [%s] ', ' '.join(added))
5561
return added
5662

5763

@@ -72,14 +78,15 @@ def delete_versions(project, version_data):
7278

7379
if to_delete_qs.count():
7480
ret_val = {obj.slug for obj in to_delete_qs}
75-
log.info("(Sync Versions) Deleted Versions: [%s]", ' '.join(ret_val))
81+
log.info('(Sync Versions) Deleted Versions: [%s]', ' '.join(ret_val))
7682
to_delete_qs.delete()
7783
return ret_val
7884
return set()
7985

8086

81-
def index_search_request(version, page_list, commit, project_scale, page_scale,
82-
section=True, delete=True):
87+
def index_search_request(
88+
version, page_list, commit, project_scale, page_scale, section=True,
89+
delete=True):
8390
"""
8491
Update search indexes with build output JSON.
8592
@@ -91,21 +98,25 @@ def index_search_request(version, page_list, commit, project_scale, page_scale,
9198
project = version.project
9299

93100
log_msg = ' '.join([page['path'] for page in page_list])
94-
log.info("Updating search index: project=%s pages=[%s]",
95-
project.slug, log_msg)
101+
log.info(
102+
'Updating search index: project=%s pages=[%s]',
103+
project.slug,
104+
log_msg,
105+
)
96106

97107
project_obj = ProjectIndex()
98-
project_obj.index_document(data={
99-
'id': project.pk,
100-
'name': project.name,
101-
'slug': project.slug,
102-
'description': project.description,
103-
'lang': project.language,
104-
'author': [user.username for user in project.users.all()],
105-
'url': project.get_absolute_url(),
106-
'tags': None,
107-
'weight': project_scale,
108-
})
108+
project_obj.index_document(
109+
data={
110+
'id': project.pk,
111+
'name': project.name,
112+
'slug': project.slug,
113+
'description': project.description,
114+
'lang': project.language,
115+
'author': [user.username for user in project.users.all()],
116+
'url': project.get_absolute_url(),
117+
'tags': None,
118+
'weight': project_scale,
119+
})
109120

110121
page_obj = PageIndex()
111122
section_obj = SectionIndex()
@@ -114,7 +125,7 @@ def index_search_request(version, page_list, commit, project_scale, page_scale,
114125
routes = [project.slug]
115126
routes.extend([p.parent.slug for p in project.superprojects.all()])
116127
for page in page_list:
117-
log.debug("Indexing page: %s:%s", project.slug, page['path'])
128+
log.debug('Indexing page: %s:%s', project.slug, page['path'])
118129
to_hash = '-'.join([project.slug, version.slug, page['path']])
119130
page_id = hashlib.md5(to_hash.encode('utf-8')).hexdigest()
120131
index_list.append({
@@ -131,8 +142,12 @@ def index_search_request(version, page_list, commit, project_scale, page_scale,
131142
})
132143
if section:
133144
for sect in page['sections']:
134-
id_to_hash = '-'.join([project.slug, version.slug,
135-
page['path'], sect['id']])
145+
id_to_hash = '-'.join([
146+
project.slug,
147+
version.slug,
148+
page['path'],
149+
sect['id'],
150+
])
136151
section_index_list.append({
137152
'id': (hashlib.md5(id_to_hash.encode('utf-8')).hexdigest()),
138153
'project': project.slug,
@@ -144,29 +159,40 @@ def index_search_request(version, page_list, commit, project_scale, page_scale,
144159
'weight': page_scale,
145160
})
146161
for route in routes:
147-
section_obj.bulk_index(section_index_list, parent=page_id,
148-
routing=route)
162+
section_obj.bulk_index(
163+
section_index_list,
164+
parent=page_id,
165+
routing=route,
166+
)
149167

150168
for route in routes:
151169
page_obj.bulk_index(index_list, parent=project.slug, routing=route)
152170

153171
if delete:
154-
log.info("Deleting files not in commit: %s", commit)
172+
log.info('Deleting files not in commit: %s', commit)
155173
# TODO: AK Make sure this works
156174
delete_query = {
157-
"query": {
158-
"bool": {
159-
"must": [
160-
{"term": {"project": project.slug, }},
161-
{"term": {"version": version.slug, }},
175+
'query': {
176+
'bool': {
177+
'must': [
178+
{
179+
'term': {
180+
'project': project.slug,
181+
},
182+
},
183+
{
184+
'term': {
185+
'version': version.slug,
186+
},
187+
},
162188
],
163-
"must_not": {
164-
"term": {
165-
"commit": commit
166-
}
167-
}
168-
}
169-
}
189+
'must_not': {
190+
'term': {
191+
'commit': commit,
192+
},
193+
},
194+
},
195+
},
170196
}
171197
page_obj.delete_document(body=delete_query)
172198

0 commit comments

Comments
 (0)