Merge tag '9.9.0' into rel

Author: humitos

.circleci/config.yml

@@ -46,7 +46,6 @@ jobs:
       - run: pip install --user 'tox<5'
       - run: tox -e pre-commit
       - run: tox -e migrations
-      - run: tox -e lint
       - run: scripts/circle/install_node.sh
       - run:
           name: Add node to the path

.github/config.yml

@@ -6,4 +6,3 @@ todo:
   blobLines: 7
   caseSensitive: true
   keyword: "TODO"
-

.github/workflows/pip-tools.yaml

@@ -39,9 +39,6 @@ jobs:
       - name: Run pip-compile on requirements/testing.in
         run: pip-compile --upgrade --resolver=backtracking --output-file=requirements/testing.txt requirements/testing.in
 
-      - name: Run pip-compile on requirements/lint.in
-        run: pip-compile --upgrade --resolver=backtracking --output-file=requirements/lint.txt requirements/lint.in
-
       - name: Run pip-compile on requirements/docs.in
         run: pip-compile --upgrade --resolver=backtracking --output-file=requirements/docs.txt requirements/docs.in
 

CHANGELOG.rst

@@ -20,4 +20,3 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
-

LICENSE

@@ -67,7 +67,7 @@
 
 master_doc = "index"
 copyright = "Read the Docs, Inc & contributors"
-version = "9.8.0"
+version = "9.9.0"
 release = version
 exclude_patterns = ["_build", "shared", "_includes"]
 default_role = "obj"

common

@@ -426,4 +426,3 @@ file_filter = locale/<lang>/LC_MESSAGES/settings.po
 source_file = _build/locale/settings.pot
 source_lang = en
 type = PO
-

docs/conf.py

@@ -5,5 +5,5 @@ Disallow: /builds/
 Disallow: /sustainability/click/
 
 # This was hitting our site and causing a lot of issues
-User-agent: AhrefsBot 
+User-agent: AhrefsBot
 Disallow: /

docs/dev/design/new-sphinx-guides.rst

@@ -1,6 +1,6 @@
 {
   "name": "readthedocs",
-  "version": "9.8.0",
+  "version": "9.9.0",
   "description": "Read the Docs build dependencies",
   "author": "Read the Docs, Inc <[email protected]>",
   "scripts": {

docs/dev/design/organizations.rst

@@ -1,4 +1,4 @@
 """Read the Docs."""
 
 
-__version__ = "9.8.0"
+__version__ = "9.9.0"

docs/dev/design/sphinx-jquery.rst

@@ -1,10 +1,8 @@
+"""Renders with some extra capabilities we require for our own purposes."""
+
 import json
 
-from rest_framework.compat import (
-    INDENT_SEPARATORS,
-    LONG_SEPARATORS,
-    SHORT_SEPARATORS,
-)
+from rest_framework.compat import INDENT_SEPARATORS, LONG_SEPARATORS, SHORT_SEPARATORS
 from rest_framework.renderers import JSONRenderer
 
 
@@ -25,7 +23,7 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
           - sort_keys=True on json.dumps
           - use str instead of six.text_types
 
-        https://github.com/encode/django-rest-framework/blob/master/rest_framework/renderers.py#L89
+        https://github.com/encode/django-rest-framework/blob/b7523f4/rest_framework/renderers.py#L84
         """
         if data is None:
             return bytes()

docs/user/.tx/config

@@ -1,5 +1,6 @@
-import structlog
+"""Django configuration for readthedocs.builds application."""
 
+import structlog
 from django.apps import AppConfig
 from django.utils.translation import gettext_lazy as _
 
@@ -12,4 +13,4 @@ class Config(AppConfig):
     verbose_name = _("Builds")
 
     def ready(self):
-        import readthedocs.builds.tasks
+        import readthedocs.builds.tasks  # noqa

docs/user/build-customization.rst

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import taggit.managers
 from django.db import migrations, models
 

media/robots.txt

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.db import migrations, models
 
 import readthedocs.builds.models

package.json

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.12 on 2017-10-09 20:14
 from django.db import migrations, models
 

prospector-more.yml

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.12 on 2017-10-27 00:17
 from django.db import migrations
 

readthedocs/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.13 on 2018-10-17 04:20
 from django.db import migrations, models
 

readthedocs/api/v3/renderers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2018-11-02 13:24
 import jsonfield.fields
 from django.db import migrations

readthedocs/builds/apps.py

@@ -1,10 +1,7 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-04-25 23:04
-from __future__ import unicode_literals
-
-from django.db import migrations, models
 import django.db.models.deletion
 import django_extensions.db.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

readthedocs/builds/migrations/0001_initial.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-06-28 16:29
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 

readthedocs/builds/migrations/0002_build_command_initial.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.21 on 2019-07-04 13:10
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

readthedocs/builds/migrations/0003_add-cold-storage.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.22 on 2019-07-25 17:24
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

readthedocs/builds/migrations/0004_add-apiversion-proxy-model.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.23 on 2019-10-07 23:32
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

readthedocs/builds/migrations/0005_remove-version-alias.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.25 on 2019-11-05 23:54
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

readthedocs/builds/migrations/0006_add_config_field.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.27 on 2020-01-14 17:37
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

readthedocs/builds/migrations/0007_add-automation-rules.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.27 on 2020-01-14 17:40
 
 from django.db import migrations

readthedocs/builds/migrations/0008_remove-version-tags.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.2.16 on 2020-11-18 21:52
 
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

readthedocs/builds/migrations/0009_added_external_version_type.py

@@ -1,6 +1,6 @@
 # Generated by Django 3.2.11 on 2022-01-31 12:12
 
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

readthedocs/builds/migrations/0010_add-description-field-to-automation-rule.py

@@ -1,7 +1,5 @@
 import django_dynamic_fixture as fixture
-from django.conf import settings
 from django.test import TestCase
-from django.test.utils import override_settings
 
 from readthedocs.builds.constants import EXTERNAL
 from readthedocs.builds.models import Build, Version

readthedocs/builds/migrations/0011_version-media-availability.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 """
 Contains logic for handling version slugs.

readthedocs/builds/migrations/0012_add-predefined-match-arg-field.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 """Logic to parse and validate ``readthedocs.yaml`` file."""
 from .config import *  # noqa

readthedocs/builds/migrations/0013_version_documentation_type.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 """Helper functions to search files."""
 

readthedocs/builds/migrations/0014_migrate-doctype-from-project-to-version.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 """YAML parser for the RTD configuration file."""
 

readthedocs/builds/migrations/0031_add_version_fields_to_build.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import os
 
 from readthedocs.config.find import find_one

readthedocs/builds/migrations/0040_remove_old_jsonfields.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from io import StringIO
 
 from pytest import raises

readthedocs/builds/tests/test_celery_task_router.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from .utils import apply_fs
 
 

readthedocs/builds/version_slug.py

@@ -1,6 +1,4 @@
-import os
 
-from unittest.mock import patch
 from pytest import raises
 
 from readthedocs.config.validation import (

readthedocs/config/__init__.py

@@ -1,7 +1,7 @@
 from readthedocs.doc_builder.backends.mkdocs import (
+    ProxyPythonName,
     yaml_dump_safely,
     yaml_load_safely,
-    ProxyPythonName
 )
 
 content = '''
@@ -35,4 +35,3 @@ def test_yaml_load_safely():
 def test_yaml_dump_safely():
     data = yaml_load_safely(content)
     assert yaml_load_safely(yaml_dump_safely(data)) == data
-

readthedocs/config/find.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 def apply_fs(tmpdir, contents):
     """

readthedocs/config/parser.py

@@ -1,7 +1,6 @@
 """App configurations for core app."""
 
 import structlog
-
 from django.apps import AppConfig
 
 log = structlog.get_logger(__name__)
@@ -12,12 +11,11 @@ class CoreAppConfig(AppConfig):
     verbose_name = 'Core'
 
     def ready(self):
-        import readthedocs.core.signals  # noqa
-
         # Import `readthedocs.core.logs` to set up structlog
         import readthedocs.core.logs  # noqa
+        import readthedocs.core.signals  # noqa
 
         try:
-            import readthedocsext.monitoring.metrics.tasks
+            import readthedocsext.monitoring.metrics.tasks  # noqa
         except (ModuleNotFoundError, ImportError):
             log.info('Metrics tasks could not be imported.')

readthedocs/config/tests/test_find.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 """Email backends for core app."""
 

readthedocs/config/tests/test_parser.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 """Template context processors for core app."""
 

readthedocs/config/tests/test_utils.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 """Shared model fields and defaults."""
 

readthedocs/config/tests/test_validation.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.conf import settings
 from django.db import migrations, models
 

readthedocs/config/tests/test_yaml_loader.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.conf import settings
 from django.db import migrations, models
 

readthedocs/config/tests/utils.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.db import migrations, models