Merge branch 'master' into fix_memory_format_test

Author: brianjo

.jenkins/build.sh

@@ -15,8 +15,8 @@ export PATH=/opt/conda/bin:$PATH
 rm -rf src
 pip install -r $DIR/../requirements.txt
 
-export PATH=/opt/conda/bin:$PATH
-pip install sphinx==1.8.2 pandas
+# export PATH=/opt/conda/bin:$PATH
+# pip install sphinx==1.8.2 pandas
 
 # For Tensorboard. Until 1.14 moves to the release channel.
 pip install tb-nightly

requirements.txt

@@ -1,6 +1,6 @@
 # Refer to ./jenkins/build.sh for tutorial build instructions
 
-sphinx
+sphinx==1.8.2
 sphinx-gallery==0.3.1
 tqdm
 numpy