Merge branch 'master' of github.com:readthedocs/readthedocs.org into remote-repository-normalization

Author: humitos

CHANGELOG.rst

@@ -1,3 +1,35 @@
+Version 5.12.1
+--------------
+
+:Date: March 16, 2021
+
+* `@pyup-bot <https://github.com/pyup-bot>`__: pyup:  Scheduled weekly dependency update for week 11 (`#8019 <https://github.com/readthedocs/readthedocs.org/pull/8019>`__)
+* `@stsewd <https://github.com/stsewd>`__: Embed: Allow to override embed view for proxied use (`#8018 <https://github.com/readthedocs/readthedocs.org/pull/8018>`__)
+* `@humitos <https://github.com/humitos>`__: RemoteRepository: Improvements to `sync_vcs_data.py` script (`#8017 <https://github.com/readthedocs/readthedocs.org/pull/8017>`__)
+* `@humitos <https://github.com/humitos>`__: Stripe checkout: handle events (`#8016 <https://github.com/readthedocs/readthedocs.org/pull/8016>`__)
+* `@humitos <https://github.com/humitos>`__: Remove `contrib/` directory (`#8014 <https://github.com/readthedocs/readthedocs.org/pull/8014>`__)
+* `@stsewd <https://github.com/stsewd>`__: Dockerfile: install lsb_release (`#8010 <https://github.com/readthedocs/readthedocs.org/pull/8010>`__)
+* `@davidfischer <https://github.com/davidfischer>`__: Fix AWS image so it looks sharp (`#8009 <https://github.com/readthedocs/readthedocs.org/pull/8009>`__)
+* `@stsewd <https://github.com/stsewd>`__: Update common (`#8008 <https://github.com/readthedocs/readthedocs.org/pull/8008>`__)
+* `@stsewd <https://github.com/stsewd>`__: Update Sphinx (`#8007 <https://github.com/readthedocs/readthedocs.org/pull/8007>`__)
+* `@2Fake <https://github.com/2Fake>`__: fix small typo (`#8005 <https://github.com/readthedocs/readthedocs.org/pull/8005>`__)
+* `@stsewd <https://github.com/stsewd>`__: Embed: validate query arguments (`#8003 <https://github.com/readthedocs/readthedocs.org/pull/8003>`__)
+* `@humitos <https://github.com/humitos>`__: Stripe Checkout: handle duplicated wehbook (`#8002 <https://github.com/readthedocs/readthedocs.org/pull/8002>`__)
+* `@saadmk11 <https://github.com/saadmk11>`__: Add __str__ to RemoteRepositoryRelation and RemoteOrganizationRelation and Use raw_id_fields in Admin (`#8001 <https://github.com/readthedocs/readthedocs.org/pull/8001>`__)
+* `@saadmk11 <https://github.com/saadmk11>`__: Remove duplicate results from RemoteOrganization API (`#8000 <https://github.com/readthedocs/readthedocs.org/pull/8000>`__)
+* `@humitos <https://github.com/humitos>`__: Typo fixed on `checkout.js` (`#7998 <https://github.com/readthedocs/readthedocs.org/pull/7998>`__)
+* `@ericholscher <https://github.com/ericholscher>`__: Make SupportView login_required (`#7997 <https://github.com/readthedocs/readthedocs.org/pull/7997>`__)
+* `@ericholscher <https://github.com/ericholscher>`__: Release 5.12.0 (`#7996 <https://github.com/readthedocs/readthedocs.org/pull/7996>`__)
+* `@pyup-bot <https://github.com/pyup-bot>`__: pyup:  Scheduled weekly dependency update for week 10 (`#7995 <https://github.com/readthedocs/readthedocs.org/pull/7995>`__)
+* `@saadmk11 <https://github.com/saadmk11>`__: Remove json field from RemoteRepositoryRelation and RemoteOrganizationRelation model (`#7993 <https://github.com/readthedocs/readthedocs.org/pull/7993>`__)
+* `@humitos <https://github.com/humitos>`__: Use independent Docker image to build assets (`#7992 <https://github.com/readthedocs/readthedocs.org/pull/7992>`__)
+* `@Pradhvan <https://github.com/Pradhvan>`__: Fixes typo in getting-started-with-sphinx: (`#7991 <https://github.com/readthedocs/readthedocs.org/pull/7991>`__)
+* `@humitos <https://github.com/humitos>`__: Allow `donate` app to use Stripe Checkout for one-time donations (`#7983 <https://github.com/readthedocs/readthedocs.org/pull/7983>`__)
+* `@ericholscher <https://github.com/ericholscher>`__: Add proxito healthcheck (`#7948 <https://github.com/readthedocs/readthedocs.org/pull/7948>`__)
+* `@Pradhvan <https://github.com/Pradhvan>`__: Docs: Adds Myst to the getting started with sphinx (`#7938 <https://github.com/readthedocs/readthedocs.org/pull/7938>`__)
+* `@humitos <https://github.com/humitos>`__: Use Stripe Checkout for Gold Users (`#7889 <https://github.com/readthedocs/readthedocs.org/pull/7889>`__)
+* `@stsewd <https://github.com/stsewd>`__: Docs: guide about reproducible builds (`#7888 <https://github.com/readthedocs/readthedocs.org/pull/7888>`__)
+
 Version 5.12.0
 --------------
 

common

@@ -25,7 +25,8 @@ RUN apt-get -y install \
         libjpeg-dev \
         sqlite \
         netcat \
-        telnet
+        telnet \
+        lsb-release
 
 # https://www.postgresql.org/download/linux/ubuntu/
 # Use PostgreSQL client 12 from official PostgreSQL Ubuntu's repository to avoid this WARNING

contrib/Dockerfile

@@ -69,7 +69,7 @@ All the Sphinx documents are indexed into Elasticsearch after the build is succe
 Currently, we do not index MkDocs documents to elasticsearch, but
 `any kind of help is welcome <https://github.com/readthedocs/readthedocs.org/issues/1088>`_.
 
-Troubelshooting
+Troubleshooting
 ^^^^^^^^^^^^^^^
 
 If you get an error like::

contrib/add-project.py

@@ -9,14 +9,13 @@
 from django.conf.urls import include, url
 
 from readthedocs.analytics.proxied_api import AnalyticsView
+from readthedocs.api.v2.views.proxied import ProxiedEmbedAPI, ProxiedFooterHTML
 from readthedocs.search.proxied_api import ProxiedPageSearchAPIView
 
-from .views.proxied import ProxiedFooterHTML
-
 api_footer_urls = [
     url(r'footer_html/', ProxiedFooterHTML.as_view(), name='footer_html'),
     url(r'search/$', ProxiedPageSearchAPIView.as_view(), name='search_api'),
-    url(r'embed/', include('readthedocs.embed.urls')),
+    url(r'embed/', ProxiedEmbedAPI.as_view(), name='embed_api'),
     url(r'analytics/$', AnalyticsView.as_view(), name='analytics_api'),
 ]
 

contrib/docker_build.sh

@@ -1,6 +1,6 @@
+from readthedocs.api.v2.views.footer_views import BaseFooterHTML
 from readthedocs.core.utils.extend import SettingsOverrideObject
-
-from .footer_views import BaseFooterHTML
+from readthedocs.embed.views import EmbedAPIBase
 
 
 class BaseProxiedFooterHTML(BaseFooterHTML):
@@ -13,3 +13,15 @@ class BaseProxiedFooterHTML(BaseFooterHTML):
 class ProxiedFooterHTML(SettingsOverrideObject):
 
     _default_class = BaseProxiedFooterHTML
+
+
+class ProxiedEmbedAPIBase(EmbedAPIBase):
+
+    # DRF has BasicAuthentication and SessionAuthentication as default classes.
+    # We don't support neither in the community site.
+    authentication_classes = []
+
+
+class ProxiedEmbedAPI(SettingsOverrideObject):
+
+    _default_class = ProxiedEmbedAPIBase