Merge branch 'mrgn-docs' of github.com:vanvalenlab/kiosk-redis-consum…

…er into mrgn-docs
vanvalenlab · Feb 28, 2020 · 0551e97 · 0551e97
2 parents f5e5ada + 7d95bbb
commit 0551e97
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,11 +17,11 @@ cache: pip
 install:
   - pip install -r requirements.txt
   - pip install pytest pytest-cov==2.5.1 pytest-pep8 coveralls
-  # - pip install -r docs/rtd-requirements.txt
+  - pip install -r docs/rtd-requirements.txt
 
 script:
   - PYTHONPATH=$PWD:$PYTHONPATH pytest --cov=redis_consumer --pep8
-  # - PYTHONPATH=$PWD:$PYTHONPATH sphinx-build -nT -b dummy ./docs/source build/html
+  - PYTHONPATH=$PWD:$PYTHONPATH sphinx-build -nT -b dummy ./docs/source build/html
 
 jobs:
   include:

diff --git a/docs/rtd-requirements.txt b/docs/rtd-requirements.txt
@@ -1,6 +1,6 @@
 m2r
 mock==3.0.5
-Sphinx==2.3.1
+Sphinx>=1.8.5
 
 boto3==1.9.195
 google-cloud-storage>=1.16.1

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -15,7 +15,12 @@
 import os
 import sys
 from datetime import datetime
-import urllib.request
+
+try:
+    from urllib.request import urlretrieve
+except ImportError:
+    from urllib import urlretrieve
+
 sys.path.insert(0, os.path.abspath('../..'))
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__))))
 
@@ -218,7 +223,7 @@
 # -- Custom Document processing ----------------------------------------------
 
 # Download gensidebar
-urllib.request.urlretrieve(
+urlretrieve(
     'https://raw.githubusercontent.com/vanvalenlab/kiosk/{}/docs/source/gensidebar.py'.format(
         rtd_version),
     'gensidebar.py'