Merge pull request #4149 from stsewd/fix-prospector-deps

Fix prospector dependencies
readthedocs · May 29, 2018 · c6ce437 · c6ce437
2 parents 911bd90 + bb165b8
commit c6ce437
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 15 deletions.
diff --git a/readthedocs/cdn/purge.py b/readthedocs/cdn/purge.py
@@ -21,6 +21,7 @@ def chunks(in_list, chunk_size):
     for i in range(0, len(in_list), chunk_size):
         yield in_list[i:i + chunk_size]
 
+
 if CDN_USERNAME and CDN_KEY and CDN_SECRET and CDN_SERVICE == 'maxcdn':
     from maxcdn import MaxCDN
     api = MaxCDN(CDN_USERNAME, CDN_KEY, CDN_SECRET)

diff --git a/readthedocs/core/management/commands/reindex_elasticsearch.py b/readthedocs/core/management/commands/reindex_elasticsearch.py
@@ -44,7 +44,7 @@ def handle(self, *args, **options):
             log.info("Reindexing %s", version)
             try:
                 commit = version.project.vcs_repo(version.slug).commit
-            except:  # pylint: disable=bare-except
+            except:  # noqa
                 # An exception can be thrown here in production, but it's not
                 # documented what the exception here is
                 commit = None

diff --git a/readthedocs/core/middleware.py b/readthedocs/core/middleware.py
@@ -114,7 +114,7 @@ def process_request(self, request):
                     log.debug(LOG_TEMPLATE.format(
                         msg='CNAME detected: %s' % request.slug,
                         **log_kwargs))
-                except:
+                except:  # noqa
                     # Some crazy person is CNAMEing to us. 404.
                     log.exception(LOG_TEMPLATE.format(msg='CNAME 404', **log_kwargs))
                     raise Http404(_('Invalid hostname'))

diff --git a/readthedocs/core/validators.py b/readthedocs/core/validators.py
@@ -46,6 +46,7 @@ def __call__(self, value):
                 raise exc
             super(DomainNameValidator, self).__call__(idnavalue)
 
+
 validate_domain_name = DomainNameValidator()
 
 

diff --git a/readthedocs/doc_builder/environments.py b/readthedocs/doc_builder/environments.py
@@ -672,7 +672,7 @@ def __enter__(self):
 
         try:
             self.create_container()
-        except:  # pylint: disable=broad-except
+        except:  # noqa
             self.__exit__(*sys.exc_info())
             raise
         return self

diff --git a/readthedocs/gold/admin.py b/readthedocs/gold/admin.py
@@ -11,4 +11,5 @@ class GoldAdmin(admin.ModelAdmin):
     list_display = ('user', 'level', 'modified_date', 'subscribed')
     list_filter = ('level',)
 
+
 admin.site.register(GoldUser, GoldAdmin)
diff --git a/readthedocs/redirects/admin.py b/readthedocs/redirects/admin.py
@@ -10,4 +10,5 @@ class RedirectAdmin(admin.ModelAdmin):
     list_display = ['project', 'redirect_type', 'from_url', 'to_url']
     raw_id_fields = ('project',)
 
+
 admin.site.register(Redirect, RedirectAdmin)
diff --git a/readthedocs/search/parse_json.py b/readthedocs/search/parse_json.py
@@ -35,8 +35,7 @@ def process_all_json_files(version, build_dir=True):
             if result:
                 page_list.append(result)
         # we're unsure which exceptions can be raised
-        # pylint: disable=bare-except
-        except:
+        except:  # noqa
             pass
     return page_list
 

diff --git a/readthedocs/search/utils.py b/readthedocs/search/utils.py
@@ -290,8 +290,7 @@ def parse_mkdocs_sections(content):
                     'content': h2_content,
                 }
     # we're unsure which exceptions can be raised
-    # pylint: disable=bare-except
-    except:
+    except:  # noqa
         log.exception('Failed indexing')
 
 

diff --git a/requirements/lint.txt b/requirements/lint.txt
@@ -1,9 +1,8 @@
 -r pip.txt
-maxcdn
-# astroid 1.6.2 breaks pylint-django
-# https://github.com/PyCQA/pylint-django/issues/117
-astroid==1.6.1
-pylint
-prospector
-pylint-django
-pyflakes
+maxcdn==0.0.7
+astroid==1.6.4
+pylint==1.9.1
+pylint-django==0.11.1
+pylint-celery==0.3
+prospector==0.12.10
+pyflakes==2.0.0