Merge branch 'master' into separate-dev-docs

astrojuanlu · astrojuanlu · commit 5af0de3d69cc · 2021-12-20T07:04:19.000-05:00
diff --git a/docs/user/advertising/ad-blocking.rst b/docs/user/advertising/ad-blocking.rst
@@ -14,12 +14,12 @@ and don't do creepy behavioral targeting.
 
 Advertising is the single largest source of funding for Read the Docs.
 To keep our operations sustainable, we ask that you either
-:ref:`allow our Ethical Ads <advertising/ad-blocking:Allowing Ethical Ads>`
+:ref:`allow our EthicalAds <advertising/ad-blocking:Allowing EthicalAds>`
 or :ref:`go ad-free <advertising/ad-blocking:Going ad-free>`.
 
 
-Allowing Ethical Ads
---------------------
+Allowing EthicalAds
+-------------------
 
 If you use AdBlock or AdBlockPlus
 and you allow `acceptable ads`_ or `privacy-friendly acceptable ads`_
diff --git a/docs/user/tutorial/index.rst b/docs/user/tutorial/index.rst
@@ -208,7 +208,7 @@ If you now click on :guilabel:`View docs`, you will see your documentation live!
    check out our `Sustainability page <https://readthedocs.org/sustainability/>`_.
 
    If you don't see the ad, you might be using an ad blocker.
-   Our Ethical Ads network respects your privacy, doesn't target you,
+   Our EthicalAds network respects your privacy, doesn't target you,
    and tries to be as unobstrusive as possible,
    so we would like to kindly ask you to :doc:`not block us </advertising/ad-blocking>` |:heart:|
 
diff --git a/readthedocs/api/v3/routers.py b/readthedocs/api/v3/routers.py
@@ -6,16 +6,16 @@ class DocsAPIRootView(APIRootView):
 
     # Overridden only to add documentation for BrowsableAPIRenderer.
 
+    # noqa
     """
-    Read the Docs APIv3 root endpoint.
+    Each request requires an `Authorization` HTTP header with `Token <your-token>`,
+    find the token in [your account](/accounts/tokens/).
 
-    The API is browsable by sending the header ``Authorization: Token <token>`` on each request. You can find your Token at [https://readthedocs.org/accounts/tokens/](https://readthedocs.org/accounts/tokens/).
-
-    Read its full documentation at [https://docs.readthedocs.io/page/api/v3.html](https://docs.readthedocs.io/page/api/v3.html).
-    """  # noqa
+    Read the full documentation at <https://docs.readthedocs.io/page/api/v3.html>.
+    """
 
     def get_view_name(self):
-        return 'Read the Docs APIv3'
+        return 'Read the Docs API v3'
 
 
 class DefaultRouterWithNesting(NestedRouterMixin, DefaultRouter):
diff --git a/readthedocs/api/v3/serializers.py b/readthedocs/api/v3/serializers.py
@@ -524,7 +524,7 @@ class ProjectUpdateSerializer(SettingsOverrideObject):
     _default_class = ProjectUpdateSerializerBase
 
 
-class ProjectSerializerBase(FlexFieldsModelSerializer):
+class ProjectSerializer(FlexFieldsModelSerializer):
 
     """
     Project serializer.
@@ -627,13 +627,6 @@ def get_subproject_of(self, obj):
             return None
 
 
-# FIXME: this override isn't needed, but tests will fail if removed.
-# We may have been relying on a weird behavior of using this class
-# as a base class of another.
-class ProjectSerializer(SettingsOverrideObject):
-    _default_class = ProjectSerializerBase
-
-
 class SubprojectCreateSerializer(FlexFieldsModelSerializer):
 
     """Serializer used to define a Project as subproject of another Project."""
diff --git a/readthedocs/api/v3/tests/mixins.py b/readthedocs/api/v3/tests/mixins.py
@@ -22,6 +22,7 @@
     PRODUCTION_DOMAIN='readthedocs.org',
     USE_SUBDOMAIN=True,
     RTD_BUILD_MEDIA_STORAGE='readthedocs.rtd_tests.storage.BuildMediaFileSystemStorageTest',
+    RTD_ALLOW_ORGANIZATIONS=False,
 )
 class APIEndpointMixin(TestCase):
 
diff --git a/readthedocs/api/v3/tests/responses/projects-subprojects-detail.json b/readthedocs/api/v3/tests/responses/projects-subprojects-detail.json
@@ -35,55 +35,6 @@
             "url": "https://github.com/rtfd/subproject"
         },
         "slug": "subproject",
-        "subproject_of": {
-            "_links": {
-                "_self": "https://readthedocs.org/api/v3/projects/project/",
-                "builds": "https://readthedocs.org/api/v3/projects/project/builds/",
-                "environmentvariables": "https://readthedocs.org/api/v3/projects/project/environmentvariables/",
-                "redirects": "https://readthedocs.org/api/v3/projects/project/redirects/",
-                "subprojects": "https://readthedocs.org/api/v3/projects/project/subprojects/",
-                "superproject": "https://readthedocs.org/api/v3/projects/project/superproject/",
-                "translations": "https://readthedocs.org/api/v3/projects/project/translations/",
-                "versions": "https://readthedocs.org/api/v3/projects/project/versions/"
-            },
-            "created": "2019-04-29T10:00:00Z",
-            "default_branch": "master",
-            "default_version": "latest",
-            "homepage": "http://project.com",
-            "id": 1,
-            "language": {
-                "code": "en",
-                "name": "English"
-            },
-            "modified": "2019-04-29T12:00:00Z",
-            "name": "project",
-            "programming_language": {
-                "code": "words",
-                "name": "Only Words"
-            },
-            "repository": {
-                "type": "git",
-                "url": "https://github.com/rtfd/project"
-            }, "slug": "project",
-            "subproject_of": null,
-            "tags": [
-                "tag",
-                "project",
-                "test"
-            ],
-            "translation_of": null,
-            "urls": {
-                "builds": "https://readthedocs.org/projects/project/builds/",
-                "documentation": "http://project.readthedocs.io/en/latest/",
-                "home": "https://readthedocs.org/projects/project/",
-                "versions": "https://readthedocs.org/projects/project/versions/"
-            },
-            "users": [
-                {
-                    "username": "testuser"
-                }
-            ]
-        },
         "tags": [],
         "translation_of": null,
         "urls": {
diff --git a/readthedocs/api/v3/tests/responses/projects-subprojects-list.json b/readthedocs/api/v3/tests/responses/projects-subprojects-list.json
@@ -40,55 +40,6 @@
                     "url": "https://github.com/rtfd/subproject"
                 },
                 "slug": "subproject",
-                "subproject_of": {
-                    "_links": {
-                        "_self": "https://readthedocs.org/api/v3/projects/project/",
-                        "builds": "https://readthedocs.org/api/v3/projects/project/builds/",
-                        "environmentvariables": "https://readthedocs.org/api/v3/projects/project/environmentvariables/",
-                        "redirects": "https://readthedocs.org/api/v3/projects/project/redirects/",
-                        "subprojects": "https://readthedocs.org/api/v3/projects/project/subprojects/",
-                        "superproject": "https://readthedocs.org/api/v3/projects/project/superproject/",
-                        "translations": "https://readthedocs.org/api/v3/projects/project/translations/",
-                        "versions": "https://readthedocs.org/api/v3/projects/project/versions/"
-                    },
-                    "created": "2019-04-29T10:00:00Z",
-                    "default_branch": "master",
-                    "default_version": "latest",
-                    "homepage": "http://project.com",
-                    "id": 1,
-                    "language": {
-                        "code": "en",
-                        "name": "English"
-                    },
-                    "modified": "2019-04-29T12:00:00Z",
-                    "name": "project",
-                    "programming_language": {
-                        "code": "words",
-                        "name": "Only Words"
-                    },
-                    "repository": {
-                        "type": "git",
-                        "url": "https://github.com/rtfd/project"
-                    }, "slug": "project",
-                    "subproject_of": null,
-                    "tags": [
-                        "tag",
-                        "project",
-                        "test"
-                    ],
-                    "translation_of": null,
-                    "urls": {
-                        "builds": "https://readthedocs.org/projects/project/builds/",
-                        "documentation": "http://project.readthedocs.io/en/latest/",
-                        "home": "https://readthedocs.org/projects/project/",
-                        "versions": "https://readthedocs.org/projects/project/versions/"
-                    },
-                    "users": [
-                        {
-                            "username": "testuser"
-                        }
-                    ]
-                },
                 "tags": [],
                 "translation_of": null,
                 "urls": {
diff --git a/readthedocs/api/v3/tests/responses/projects-subprojects-list_POST.json b/readthedocs/api/v3/tests/responses/projects-subprojects-list_POST.json
@@ -35,55 +35,6 @@
             "url": "https://github.com/rtfd/project"
         },
         "slug": "new-project",
-        "subproject_of": {
-            "_links": {
-                "_self": "https://readthedocs.org/api/v3/projects/project/",
-                "builds": "https://readthedocs.org/api/v3/projects/project/builds/",
-                "environmentvariables": "https://readthedocs.org/api/v3/projects/project/environmentvariables/",
-                "redirects": "https://readthedocs.org/api/v3/projects/project/redirects/",
-                "subprojects": "https://readthedocs.org/api/v3/projects/project/subprojects/",
-                "superproject": "https://readthedocs.org/api/v3/projects/project/superproject/",
-                "translations": "https://readthedocs.org/api/v3/projects/project/translations/",
-                "versions": "https://readthedocs.org/api/v3/projects/project/versions/"
-            },
-            "created": "2019-04-29T10:00:00Z",
-            "default_branch": "master",
-            "default_version": "latest",
-            "homepage": "http://project.com",
-            "id": 1,
-            "language": {
-                "code": "en",
-                "name": "English"
-            },
-            "modified": "2019-04-29T12:00:00Z",
-            "name": "project",
-            "programming_language": {
-                "code": "words",
-                "name": "Only Words"
-            },
-            "repository": {
-                "type": "git",
-                "url": "https://github.com/rtfd/project"
-            }, "slug": "project",
-            "subproject_of": null,
-            "tags": [
-                "tag",
-                "project",
-                "test"
-            ],
-            "translation_of": null,
-            "urls": {
-                "builds": "https://readthedocs.org/projects/project/builds/",
-                "documentation": "http://project.readthedocs.io/en/latest/",
-                "home": "https://readthedocs.org/projects/project/",
-                "versions": "https://readthedocs.org/projects/project/versions/"
-            },
-            "users": [
-                {
-                    "username": "testuser"
-                }
-            ]
-        },
         "tags": [],
         "translation_of": null,
         "urls": {
diff --git a/readthedocs/templates/rest_framework/api.html b/readthedocs/templates/rest_framework/api.html
@@ -2,7 +2,7 @@
 {% load static %}
 
 {% block branding %}
-  <a class='navbar-brand' rel="nofollow" href='https://readthedocs.org'>
+  <a class="navbar-brand" rel="nofollow" href="https://{{ PRODUCTION_DOMAIN }}">
     Read the Docs
   </a>
 {% endblock %}
diff --git a/requirements/docker.txt b/requirements/docker.txt
@@ -30,7 +30,7 @@ argh==0.26.2
 tox==3.24.4
 
 # AWS utilities to use against MinIO
-awscli==1.22.5
+awscli==1.22.23
 
 # Used together with structlog to have nicer logs locally
-rich==10.14.0
+rich==10.16.0
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -1,6 +1,6 @@
 # Packages required to build docs, independent of application dependencies
 
-Sphinx==4.3.0
+Sphinx==4.3.1
 Pygments==2.10.0
 
 sphinx_rtd_theme==1.0.0
@@ -23,4 +23,4 @@ sphinx-autobuild==2021.3.14
 rstcheck==3.3.1
 
 # Markdown
-myst_parser==0.15.2
+myst_parser==0.16.0
diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -5,14 +5,14 @@ virtualenv==20.10.0
 
 django==2.2.25  # pyup: <2.3
 django-extensions==3.1.5
-django_polymorphic==3.0.0
+django_polymorphic==3.1.0
 django-autoslug==1.9.8
 django-simple-history==3.0.0
 
-djangorestframework==3.12.4
+djangorestframework==3.13.0
 
 # For intersphinx during builds
-Sphinx==4.3.0
+Sphinx==4.3.1
 
 # Filtering for the REST API
 django-filter==21.1
@@ -31,9 +31,9 @@ pyyaml==5.4.1  # pyup: ignore
 Pygments==2.10.0
 
 # Basic tools
-redis==3.5.3
-kombu==5.1.0
-celery==5.1.2
+redis==4.0.2
+kombu==5.2.2
+celery==5.2.1
 
 # When upgrading to 0.43.0 we should double check the ``base.html`` change
 # described in the changelog. In previous versions, the allauth app included a
@@ -48,27 +48,27 @@ requests-oauthlib==1.3.0
 GitPython==3.1.18  # pyup: ignore
 
 # Search
-elasticsearch==7.15.2  # pyup: <8.0.0
+elasticsearch==7.16.0  # pyup: <8.0.0
 elasticsearch-dsl==7.4.0  # pyup: <8.0
 django-elasticsearch-dsl==7.2.1  # pyup: <8.0
-selectolax==0.3.5
+selectolax==0.3.6
 
 # embed
 pyquery==1.4.3
 
 # NOTE: this dep can be removed in python 3.7 in favor of ``date.fromisoformat``
 python-dateutil==2.8.2
 
-orjson==3.6.4
+orjson==3.6.5
 
 # Utils
 django-gravatar2==1.4.4
 pytz==2021.3
 Unipath==1.1
 django-kombu==0.9.4
-stripe==2.62.0
+stripe==2.63.0
 regex==2021.11.10
-markdown==3.3.4
+markdown==3.3.6
 
 # unicode-slugify==0.1.5 is not released on PyPI yet
 git+https://github.com/mozilla/unicode-slugify@b696c37#egg=unicode-slugify==0.1.5
@@ -87,11 +87,11 @@ textblob==0.17.1
 django-annoying==0.10.6
 django-messages-extends==0.6.2
 djangorestframework-jsonp==1.0.2
-django-taggit==1.5.1
+django-taggit==2.0.0
 dj-pagination==2.5.0
 
 # Version comparison stuff
-packaging==21.2
+packaging==21.3
 
 # django-cors-middleware==1.5.0 fails with
 # AttributeError: 'dict' object has no attribute 'has_header'
@@ -115,12 +115,12 @@ git+https://github.com/jschneier/django-storages@d0f027c98a877f75615cfc42b4d51c0
 
 
 # Required only in development and linting
-django-debug-toolbar==3.2.2
+django-debug-toolbar==3.2.3
 
 # For enabling content-security-policy
 django-csp==3.7
 # For setting the permissions-policy security header
 django-permissions-policy==4.5.0
 
 django-structlog==2.2.0
-structlog==21.3.0
+structlog==21.4.0
diff --git a/requirements/testing.txt b/requirements/testing.txt
@@ -5,13 +5,13 @@
 django-dynamic-fixture==3.1.2
 pytest==6.2.5
 pytest-custom-exit-code==0.3.0
-pytest-django==4.4.0
-pytest-xdist==2.4.0
+pytest-django==4.5.2
+pytest-xdist==2.5.0
 pytest-cov==3.0.0
 apipkg==2.1.0
 execnet==1.9.0
 
-Mercurial==5.9.3
+Mercurial==6.0
 
 yamale==2.2.0  # pyup: <3.0
 pytest-mock==3.6.1
diff --git a/tasks.py b/tasks.py

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`PRODUCTION_DOMAIN='readthedocs.org',`
`23`	`23`	`USE_SUBDOMAIN=True,`
`24`	`24`	`RTD_BUILD_MEDIA_STORAGE='readthedocs.rtd_tests.storage.BuildMediaFileSystemStorageTest',`
	`25`	`+ RTD_ALLOW_ORGANIZATIONS=False,`
`25`	`26`	`)`
`26`	`27`	`class APIEndpointMixin(TestCase):`
`27`	`28`