Merge branch 'master' of gitlab.idiap.ch:beat/docs

.gitlab-ci.yml

@@ -58,7 +58,6 @@ build_macosx_36:
     paths:
       - _ci/
       - sphinx
-      - ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
 
 
 # Deploy targets
@@ -87,4 +86,4 @@ deploy_stable:
   only:
     - /^v\d+\.\d+\.\d+([abc]\d*)?$/  # PEP-440 compliant version (tags)
   except:
-    - branches
\ No newline at end of file
+    - branches

before_build.sh

@@ -27,7 +27,6 @@ sed -e '$s/$/\n/' \
     -e '/^beat/d' \
     -e 's:#.*$::g' \
     -e 's/[[:space:]]*$//' \
-    -s \
     doc/*/doc/extra-intersphinx.txt \
     doc/*/requirements.txt \
     doc/*/test-requirements.txt \
@@ -40,6 +39,5 @@ sed -e '$s/$/\n/' \
 sed -e '$s/$/\n/' \
     -e 's:#.*$::g' \
     -e 's/[[:space:]]*$//' \
-    -s \
     doc/*/doc/nitpick-exceptions.txt \
     | sort -u > doc/nitpick-exceptions.txt

conda/meta.yaml

@@ -3,10 +3,10 @@
 
 package:
   name: {{ name }}
-  version: {{ environ.get('BEAT_PACKAGE_VERSION', '0.0.1') }}
+  version: {{ environ.get('BOB_PACKAGE_VERSION', '0.0.1') }}
 
 build:
-  number: {{ environ.get('BEAT_BUILD_NUMBER', 0) }}
+  number: {{ environ.get('BOB_BUILD_NUMBER', 0) }}
 
 requirements:
   run:
@@ -29,6 +29,7 @@ test:
     - matplotlib
     - bob.extension
     - sphinxcontrib-programoutput
+    - sphinxcontrib-httpdomain
 
 about:
   home: https://www.idiap.ch/software/beat/

doc/conf.py

@@ -27,7 +27,8 @@ extensions = [
     'sphinx.ext.viewcode',
     'sphinx.ext.mathjax',
     'matplotlib.sphinxext.plot_directive',
-    'sphinxcontrib.programoutput'
+    'sphinxcontrib.programoutput',
+    'sphinxcontrib.httpdomain'
     ]
 
 # matplotlib.sphinxext.plot_directive