CI: fix linter (#7261)

* CI: fix linter

Linter is failing for some dependency with isort somewhere.
The latest version of prospector already pins the compatible versions of
its dependencies.

* Update common

Author: stsewd

common

@@ -0,0 +1 @@
+common/prospector-more.yml

prospector-more.yml

@@ -62,7 +62,7 @@ def top_viewed_pages(cls, project, since=None):
         if since is None:
             since = timezone.now().date() - timezone.timedelta(days=30)
 
-        qs = (
+        queryset = (
             cls.objects
             .filter(project=project, date__gte=since)
             .values_list('path')
@@ -74,7 +74,7 @@ def top_viewed_pages(cls, project, since=None):
         pages = []
         view_counts = []
 
-        for data in qs.iterator():
+        for data in queryset.iterator():
             pages.append(data[0])
             view_counts.append(data[1])
 
@@ -102,13 +102,13 @@ def page_views_by_date(cls, project_slug, since=None):
         if since is None:
             since = timezone.now().date() - timezone.timedelta(days=30)
 
-        qs = cls.objects.filter(
+        queryset = cls.objects.filter(
             project__slug=project_slug,
             date__gt=since,
         ).values('date').annotate(total_views=Sum('view_count')).order_by('date')
 
         count_dict = dict(
-            qs.order_by('date').values_list('date', 'total_views')
+            queryset.order_by('date').values_list('date', 'total_views')
         )
 
         # This fills in any dates where there is no data

prospector-more.yml

@@ -73,22 +73,22 @@ def sync_versions_to_db(project, versions, type):  # pylint: disable=redefined-b
             if version_id == old_versions[version_name]:
                 # Version is correct
                 continue
-            else:
-                # Update slug with new identifier
-                Version.objects.filter(
-                    project=project,
-                    verbose_name=version_name,
-                ).update(
-                    identifier=version_id,
-                    type=type,
-                    machine=False,
-                )  # noqa
-
-                log.info(
-                    '(Sync Versions) Updated Version: [%s=%s] ',
-                    version_name,
-                    version_id,
-                )
+
+            # Update slug with new identifier
+            Version.objects.filter(
+                project=project,
+                verbose_name=version_name,
+            ).update(
+                identifier=version_id,
+                type=type,
+                machine=False,
+            )  # noqa
+
+            log.info(
+                '(Sync Versions) Updated Version: [%s=%s] ',
+                version_name,
+                version_id,
+            )
         else:
             # New Version
             created_version = Version.objects.create(

readthedocs/analytics/models.py

@@ -189,7 +189,7 @@ def get_response_push(self, project, branches):
                 project,
                 branches,
             )
-        triggered = True if to_build else False
+        triggered = bool(to_build)
         return {
             'build_triggered': triggered,
             'project': project.slug,

readthedocs/api/v2/utils.py

@@ -16,6 +16,7 @@
 # allows /api/v3/projects/
 # allows /api/v3/projects/pip/
 # allows /api/v3/projects/pip/superproject/
+# pylint: disable=assignment-from-no-return
 projects = router.register(
     r'projects',
     ProjectsViewSet,

readthedocs/api/v2/views/integrations.py

@@ -70,8 +70,8 @@ def __init__(self, *args, **kwargs):
         populate_from = kwargs.pop('populate_from', None)
         if populate_from is None:
             raise ValueError("missing 'populate_from' argument")
-        else:
-            self._populate_from = populate_from
+
+        self._populate_from = populate_from
         super().__init__(*args, **kwargs)
 
     def get_queryset(self, model_cls, slug_field):

readthedocs/api/v3/urls.py

@@ -1,15 +1,13 @@
-# -*- coding: utf-8 -*-
-
 """Models for the core app."""
 import logging
 
 from annoying.fields import AutoOneToOneField
+from django.contrib.auth.models import User
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import ugettext
 from django.utils.translation import ugettext_lazy as _
 
-
 log = logging.getLogger(__name__)
 
 
@@ -18,7 +16,7 @@ class UserProfile(models.Model):
     """Additional information about a User."""
 
     user = AutoOneToOneField(
-        'auth.User',
+        User,
         verbose_name=_('User'),
         related_name='profile',
         on_delete=models.CASCADE,

readthedocs/builds/version_slug.py

@@ -339,7 +339,7 @@ def _use_custom_domain(self, custom_domain):
         :param custom_domain: Domain instance or ``None``
         :type custom_domain: readthedocs.projects.models.Domain
         """
-        return True if custom_domain is not None else False
+        return custom_domain is not None
 
     def _use_subdomain(self):
         """Make decision about whether to use a subdomain to serve docs."""

readthedocs/core/models.py

@@ -838,21 +838,21 @@ def __enter__(self):
                     if self.build:
                         self.build['state'] = BUILD_STATE_FINISHED
                     raise exc
-                else:
-                    log.warning(
-                        LOG_TEMPLATE,
-                        {
-                            'project': self.project.slug,
-                            'version': self.version.slug,
-                            'msg': (
-                                'Removing stale container {}'.format(
-                                    self.container_id,
-                                )
-                            ),
-                        }
-                    )
-                    client = self.get_client()
-                    client.remove_container(self.container_id)
+
+                log.warning(
+                    LOG_TEMPLATE,
+                    {
+                        'project': self.project.slug,
+                        'version': self.version.slug,
+                        'msg': (
+                            'Removing stale container {}'.format(
+                                self.container_id,
+                            )
+                        ),
+                    }
+                )
+                client = self.get_client()
+                client.remove_container(self.container_id)
         except (DockerAPIError, ConnectionError):
             # If there is an exception here, we swallow the exception as this
             # was just during a sanity check anyways.

readthedocs/core/resolver.py

@@ -112,10 +112,9 @@ def clean_project(self):
 
         if not project_instance.exists():
             raise forms.ValidationError(_('No project found.'))
-        elif project_instance.first() in self.projects:
+        if project_instance.first() in self.projects:
             raise forms.ValidationError(_('This project is already Ad-Free.'))
-        else:
-            return project_slug
+        return project_slug
 
     def clean(self):
         cleaned_data = super().clean()

readthedocs/doc_builder/environments.py

@@ -2,13 +2,13 @@
 import math
 from datetime import datetime
 
+import pytz
+from django.contrib.auth.models import User
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
-import pytz
 
 from readthedocs.projects.models import Project
 
-
 #: The membership options that are currently available
 LEVEL_CHOICES = (
     ('v1-org-5', '$5/mo'),
@@ -31,7 +31,7 @@ class GoldUser(models.Model):
     modified_date = models.DateTimeField(_('Modified date'), auto_now=True)
 
     user = models.ForeignKey(
-        'auth.User',
+        User,
         verbose_name=_('User'),
         unique=True,
         related_name='gold',

readthedocs/gold/forms.py

@@ -136,11 +136,11 @@ def create_repository(self, fields, privacy=None, organization=None):
             repo.json = json.dumps(fields)
             repo.save()
             return repo
-        else:
-            log.debug(
-                'Not importing %s because mismatched type',
-                fields['name'],
-            )
+
+        log.debug(
+            'Not importing %s because mismatched type',
+            fields['name'],
+        )
 
     def create_organization(self, fields):
         """

readthedocs/gold/models.py

@@ -195,12 +195,12 @@ def create_repository(self, fields, privacy=None, organization=None):
             repo.json = json.dumps(fields)
             repo.save()
             return repo
-        else:
-            log.info(
-                'Not importing %s because mismatched type: visibility=%s',
-                fields['name_with_namespace'],
-                fields['visibility'],
-            )
+
+        log.info(
+            'Not importing %s because mismatched type: visibility=%s',
+            fields['name_with_namespace'],
+            fields['visibility'],
+        )
 
     def create_organization(self, fields):
         """

readthedocs/oauth/services/github.py

@@ -7,8 +7,8 @@
 from django.utils.crypto import salted_hmac
 from django.utils.translation import ugettext_lazy as _
 
-from readthedocs.core.utils import slugify
 from readthedocs.core.permissions import AdminPermission
+from readthedocs.core.utils import slugify
 
 from . import constants
 from .managers import TeamManager, TeamMemberManager
@@ -99,7 +99,7 @@ def users(self):
     def members(self):
         return AdminPermission.members(self)
 
-    def save(self, *args, **kwargs):  # pylint: disable=arguments-differ
+    def save(self, *args, **kwargs):  # pylint: disable=signature-differs
         if not self.slug:
             self.slug = slugify(self.name)
 
@@ -204,7 +204,7 @@ def __str__(self):
             team=self.name,
         )
 
-    def save(self, *args, **kwargs):  # pylint: disable=arguments-differ
+    def save(self, *args, **kwargs):  # pylint: disable=signature-differs
         if not self.slug:
             self.slug = slugify(self.name)
         super().save(*args, **kwargs)
@@ -245,7 +245,7 @@ def __str__(self):
             team=self.team,
         )
 
-    def save(self, *args, **kwargs):  # pylint: disable=arguments-differ
+    def save(self, *args, **kwargs):  # pylint: disable=signature-differs
         hash_ = salted_hmac(
             # HMAC key per applications
             '.'.join([self.__module__, self.__class__.__name__]),

readthedocs/oauth/services/gitlab.py

@@ -742,21 +742,21 @@ def clean_name(self):
             raise forms.ValidationError(
                 _("Variable name can't start with __ (double underscore)"),
             )
-        elif name.startswith('READTHEDOCS'):
+        if name.startswith('READTHEDOCS'):
             raise forms.ValidationError(
                 _("Variable name can't start with READTHEDOCS"),
             )
-        elif self.project.environmentvariable_set.filter(name=name).exists():
+        if self.project.environmentvariable_set.filter(name=name).exists():
             raise forms.ValidationError(
                 _(
                     'There is already a variable with this name for this project',
                 ),
             )
-        elif ' ' in name:
+        if ' ' in name:
             raise forms.ValidationError(
                 _("Variable name can't contain spaces"),
             )
-        elif not fullmatch('[a-zA-Z0-9_]+', name):
+        if not fullmatch('[a-zA-Z0-9_]+', name):
             raise forms.ValidationError(
                 _('Only letters, numbers and underscore are allowed'),
             )

readthedocs/organizations/models.py

@@ -67,13 +67,13 @@ class ProjectRelationship(models.Model):
     """
 
     parent = models.ForeignKey(
-        'Project',
+        'projects.Project',
         verbose_name=_('Parent'),
         related_name='subprojects',
         on_delete=models.CASCADE,
     )
     child = models.ForeignKey(
-        'Project',
+        'projects.Project',
         verbose_name=_('Child'),
         related_name='superprojects',
         on_delete=models.CASCADE,
@@ -1330,7 +1330,7 @@ class ImportedFile(models.Model):
     """
 
     project = models.ForeignKey(
-        'Project',
+        Project,
         verbose_name=_('Project'),
         related_name='imported_files',
         on_delete=models.CASCADE,

readthedocs/projects/forms.py

@@ -1411,7 +1411,7 @@ def warn(self, msg):
                     'Error while getting sphinx domain information for %s:%s:%s. Skipping.',
                     version.project.slug,
                     version.slug,
-                    f'domain->name',
+                    f'{domain}->{name}',
                 )
                 continue