Merge branch 'master' into issues5101

Author: Mike-Dai

docs/custom_domains.rst

@@ -60,7 +60,7 @@ FAQ <https://support.cloudflare.com/hc/en-us/articles/115000310832-Certification
     Some older setups configured a CNAME record pointing to ``readthedocs.org``
     or another variation. While these continue to resolve,
     they do not yet allow us to acquire SSL certificates for those domains.
-    Point the CNAME to ``readthedocs.io`` and re-request a certificate
+    Point the CNAME to ``readthedocs.io``, with no subdomain, and re-request a certificate
     by saving the domain in the project admin (:guilabel:`Domains` >
     :guilabel:`Edit Domain`).
 

readthedocs/doc_builder/python_environments.py

@@ -303,7 +303,7 @@ def install_core_requirements(self):
                 self.project.get_feature_value(
                     Feature.USE_SPHINX_LATEST,
                     positive='sphinx<2',
-                    negative='sphinx<1.8',
+                    negative='sphinx<2',
                 ),
                 'sphinx-rtd-theme<0.5',
                 'readthedocs-sphinx-ext<0.6',

requirements/pip.txt

@@ -1,14 +1,14 @@
 # Base packages
 pip==19.0.3
 appdirs==1.4.3
-virtualenv==16.4.1
+virtualenv==16.4.3
 
 django==1.11.20  # pyup: <1.12
 django-tastypie==0.14.2
 django-guardian==1.5.0
 django-extensions==2.1.6
 
-djangorestframework==3.9.1
+djangorestframework==3.9.2
 
 # For intersphinx during builds
 Sphinx==1.8.4
@@ -40,7 +40,7 @@ redis==2.10.6  # pyup: ignore
 # when ALWAYS_EAGER = True
 celery==4.1.1  # pyup: ignore
 
-django-allauth==0.38.0
+django-allauth==0.39.1
 
 # GitPython 2.1.11 makes TestGitBackend.test_git_tags to fail because
 # of an UnicodeError