V2.16.x -> dev (#714)

underworldcode · Mar 4, 2025 · 700890e · 700890e
1 parent 8e4809f
commit 700890e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -9,6 +9,10 @@ version: 2
 sphinx:
   configuration:  docs/development/docs_generator/conf.py
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
 # Build documentation with MkDocs
 #mkdocs:
 #  configuration: mkdocs.yml
@@ -18,6 +22,5 @@ sphinx:
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.7
   install:
-    - requirements: docs/development/docs_generator/requirements.txt
+    - requirements: docs/development/docs_generator/requirements.txt
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM underworldcode/underworld2:2.15.1b
+FROM underworldcode/underworld2:2.16.0-ompi
 
 # Set the UW_MACHINE env variable for metrics
-ENV UW_MACHINE binder
+ENV UW_MACHINE=binder
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ Note that it can take a while for the site to fire up and that it will time-out
 
 | | |
 |-|-|
-| [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/underworldcode/underworld2/v2.13.0b) | v2.13.0b |
+| [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/underworldcode/underworld2/v2.16.x) | v2.16.x |
 | [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/underworldcode/underworld2/v2.12.0b) | v2.12.0b |
 | [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/underworldcode/underworld2/v2.11.0b) | v2.11.0b |
 | [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/underworldcode/underworld2/development) | dev |

diff --git a/docs/development/docs_generator/conf.py b/docs/development/docs_generator/conf.py
@@ -461,7 +461,7 @@
 # add current directory for `generate_api_documentation`
 sys.path.append(os.path.dirname(__name__))
 # add top project directory as well
-sys.path.append(os.path.join(os.path.dirname(__name__),'../../..'))
+sys.path.append(os.path.join(os.path.dirname(__name__),'../../../src/'))
 
 try:
     import underworld

diff --git a/docs/development/docs_generator/generate_api_documentation.py b/docs/development/docs_generator/generate_api_documentation.py
@@ -16,7 +16,7 @@
 import shutil
 import os
 import glob
-for filename in glob.glob(os.path.join("../../../underworld/function/images/", '*.png')):
+for filename in glob.glob(os.path.join("../../../src/underworld/function/images/", '*.png')):
     shutil.copy(filename, imagedir)
 
 done_mods = set()
@@ -143,4 +143,4 @@ def doc_module(module, modname):
 
 import underworld
 import underworld.visualisation
-doc_module(underworld, 'underworld')
+doc_module(underworld, 'underworld')
diff --git a/docs/development/docs_generator/requirements.txt b/docs/development/docs_generator/requirements.txt
@@ -1,2 +1,4 @@
 jupyter
 pandoc
+sphinx_rtd_theme
+mock