Merge branch 'master' into issue235-vw-ensemble-backend

.readthedocs.yml

@@ -0,0 +1,21 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Optionally build your docs in additional formats such as PDF and ePub
+#formats: all
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+   install:
+      - requirements: docs/requirements.txt
+      - method: setuptools
+        path: .
+   system_packages: true

Pipfile

@@ -13,7 +13,6 @@ swagger-tester = "*"
 bumpversion = "*"
 sphinx = "*"
 sphinx-rtd-theme = "*"
-pipenv-to-requirements = "*"
 
 [packages]
 "e1839a8" = {editable = true, path = "."}
@@ -27,5 +26,6 @@ gensim = "*"
 sklearn = "*"
 rdflib = "*"
 gunicorn = "*"
+sphinxcontrib-apidoc = "*"
 
 [requires]

docs/conf.py

@@ -40,7 +40,8 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc'
+    'sphinx.ext.autodoc',
+    'sphinxcontrib.apidoc',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -51,6 +52,9 @@
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 
+apidoc_module_dir = '../annif'
+apidoc_output_dir = 'source'
+apidoc_separate_modules = False
 
 # -- Options for HTML output -------------------------------------------------
 

docs/requirements.txt

@@ -0,0 +1 @@
+sphinxcontrib-apidoc==0.3.0