[fbsync] Remove hardcoded dependency version for sphinx (#3660)

Summary:
* Try using the pyortch theme

* directly embed script in layout.html instead

* use more mordern script

Reviewed By: NicolasHug

Differential Revision: D28169165

fbshipit-source-id: 564c5babbc3a96fc32fc9ada891dc2bdd339eb74

Co-authored-by: Francisco Massa <[email protected]>

Author: 2 people

docs/Makefile

@@ -2,7 +2,7 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    = -W  # turn warnings into errors
+SPHINXOPTS    = # -W  # turn warnings into errors
 SPHINXBUILD   = sphinx-build
 SPHINXPROJ    = torchvision
 SOURCEDIR     = source

docs/requirements.txt

@@ -1,3 +1,2 @@
-sphinx==1.7.3
-sphinxcontrib-googleanalytics
+sphinx
 -e git+git://github.com/pytorch/pytorch_sphinx_theme.git#egg=pytorch_sphinx_theme

docs/source/_templates/layout.html

@@ -1,5 +1,17 @@
 {% extends "!layout.html" %}
 
+{%- block extrahead %}
+<!-- Google Analytics -->
+<script>
+  window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
+  ga('create', 'UA-90545585-1', 'auto');
+  ga('send', 'pageview');
+</script>
+<script async src='https://www.google-analytics.com/analytics.js'></script>
+<!-- End Google Analytics -->
+{{ super() }}
+{% endblock %}
+
 {% block sidebartitle %}
     <div class="version">
       <a href='https://pytorch.org/vision/versions.html'>{{ version }} &#x25BC</a>

docs/source/conf.py

@@ -23,23 +23,8 @@
 import torch
 import torchvision
 import pytorch_sphinx_theme
-from sphinxcontrib import googleanalytics
 
 
-# Wrap sphinxcontrib-googleanalytics setup() function to avoid a Sphinx warning:
-# "WARNING: extension ‘sphinxcontrib.googleanalytics’ returned an unsupported
-# object from its setup() function; it should return None or a metadata
-# dictionary"
-_googleanalytics_setup_original = googleanalytics.setup
-
-
-def _googleanalytics_setup_wrapper(app):
-    _googleanalytics_setup_original(app)
-    return {"version": "0.1"}
-
-
-googleanalytics.setup = _googleanalytics_setup_wrapper
-
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -59,16 +44,12 @@ def _googleanalytics_setup_wrapper(app):
     'sphinx.ext.mathjax',
     'sphinx.ext.napoleon',
     'sphinx.ext.viewcode',
-    'sphinxcontrib.googleanalytics',
 ]
 
 napoleon_use_ivar = True
 napoleon_numpy_docstring = False
 napoleon_google_docstring = True
 
-googleanalytics_id = 'UA-90545585-1'
-googleanalytics_enabled = True
-
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']