[#2161] .readthedocs.yaml

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644 (file)
index 0000000..27b6082
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,12 @@
+build:
+  os: ubuntu-20.04
+  tools:
+    python: '3.9'
+formats: all
+python:
+   install:
+   - requirements: doc/sphinx/src/requirements.txt
+sphinx:
+   configuration: doc/sphinx/conf.py
+   fail_on_warning: true
+version: 2

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index 86bec84b99b8903265aef15aa60a8056e441a5b3..513d2d03f17b0a71fd76bfc9657730b931fb16f5 100644 (file)
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -12,10 +12,11 @@ sphinxopts += -W
 sphinxopts += -j 2
 sphinxopts += -c "${abs_srcdir}"
 
-static_sources =
-include static/static_sources.mk
-
-EXTRA_DIST += static/static_sources.mk
+static_sources  =
+static_sources += static/kea-imageonly-100bw.png
+static_sources += static/kea-logo-100x70.png
+static_sources += static/kea-logo-200.png
+static_sources += static/kea.css
 
 # ARM
 rst_arm_sources =
@@ -178,6 +179,9 @@ $(man8s): mans
 mans: $(man_sources) api-files.txt mes-files.txt
        $(SPHINXBUILD) -M man $(srcdir) $(sphinxbuilddir) $(sphinxopts)
 
+update-python-dependencies: ./src/requirements.in
+       pip-compile -r ./src/requirements.in
+
 clean-local:
        rm -rf $(sphinxbuilddir)
        rm -f $(srcdir)/mes-files.txt $(srcdir)/api-files.txt

diff --git a/doc/sphinx/src/requirements.in b/doc/sphinx/src/requirements.in
new file mode 100644 (file)
index 0000000..cbf1e36
--- /dev/null
+++ b/doc/sphinx/src/requirements.in
@@ -0,0 +1,2 @@
+sphinx
+sphinx-rtd-theme

diff --git a/doc/sphinx/src/requirements.txt b/doc/sphinx/src/requirements.txt
new file mode 100644 (file)
index 0000000..2aa1f23
--- /dev/null
+++ b/doc/sphinx/src/requirements.txt
@@ -0,0 +1,61 @@
+#
+# This file is autogenerated by pip-compile with python 3.9
+# To update, run:
+#
+#    pip-compile ./src/requirements.in
+#
+alabaster==0.7.12
+    # via sphinx
+babel==2.9.1
+    # via sphinx
+certifi==2021.10.8
+    # via requests
+charset-normalizer==2.0.7
+    # via requests
+docutils==0.17.1
+    # via
+    #   sphinx
+    #   sphinx-rtd-theme
+idna==3.3
+    # via requests
+imagesize==1.3.0
+    # via sphinx
+jinja2==3.0.2
+    # via sphinx
+markupsafe==2.0.1
+    # via jinja2
+packaging==21.2
+    # via sphinx
+pygments==2.10.0
+    # via sphinx
+pyparsing==2.4.7
+    # via packaging
+pytz==2021.3
+    # via babel
+requests==2.26.0
+    # via sphinx
+snowballstemmer==2.1.0
+    # via sphinx
+sphinx==4.2.0
+    # via
+    #   -r ./src/requirements.in
+    #   sphinx-rtd-theme
+sphinx-rtd-theme==1.0.0
+    # via -r ./src/requirements.in
+sphinxcontrib-applehelp==1.0.2
+    # via sphinx
+sphinxcontrib-devhelp==1.0.2
+    # via sphinx
+sphinxcontrib-htmlhelp==2.0.0
+    # via sphinx
+sphinxcontrib-jsmath==1.0.1
+    # via sphinx
+sphinxcontrib-qthelp==1.0.3
+    # via sphinx
+sphinxcontrib-serializinghtml==1.1.5
+    # via sphinx
+urllib3==1.26.7
+    # via requests
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

diff --git a/doc/sphinx/static/static_sources.mk b/doc/sphinx/static/static_sources.mk
deleted file mode 100644 (file)
index 90a5dfb..0000000
--- a/doc/sphinx/static/static_sources.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-static_sources += static/kea-imageonly-100bw.png
-static_sources += static/kea-logo-100x70.png
-static_sources += static/kea-logo-200.png
-static_sources += static/kea.css

diff --git a/hammer.py b/hammer.py
index e2b4351911de611a67d64fdb9f0e6d4b8a47fabd..e2a3d10ca5a9c02377ff63c3290b10779431b900 100755 (executable)
--- a/hammer.py
+++ b/hammer.py
@@ -1472,7 +1472,7 @@ def prepare_system_local(features, check_times):
         if 'docs' in features:
             execute('virtualenv-3 ~/venv',
                     env=env, timeout=60, check_times=check_times)
-            execute('~/venv/bin/pip install sphinx==3.5.4 sphinx-rtd-theme==0.5.2',
+            execute('~/venv/bin/pip install sphinx sphinx-rtd-theme',
                     env=env, timeout=120, check_times=check_times)
 
         if 'cql' in features:
@@ -1653,7 +1653,7 @@ def prepare_system_local(features, check_times):
         if 'docs' in features and revision == '8':
             execute('virtualenv -p /usr/bin/python3 ~/venv',
                     env=env, timeout=60, check_times=check_times)
-            execute('~/venv/bin/pip install sphinx typing sphinx-rtd-theme',
+            execute('~/venv/bin/pip install sphinx sphinx-rtd-theme',
                     env=env, timeout=120, check_times=check_times)
 
         if 'cql' in features and revision != '8':