Commit: 88e0fcfa9ae2cc15fd8c3db471bb7618b458ee1a - DocIdeas (hg)

Commit MetaInfo

• Révision: 88e0fcfa9ae2cc15fd8c3db471bb7618b458ee1a (tree)
• l'heure: 2024-04-29 18:54:59
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

RTD: TRY to use a modern plantUML ...(started)

Change Summary

• modified: .readthedocs.yaml
• modified: conf.py

Modification

diff -r ab3fcb325f7e -r 88e0fcfa9ae2 .readthedocs.yaml
--- a/.readthedocs.yaml	Sun Apr 28 20:14:17 2024 +0200
+++ b/.readthedocs.yaml	Mon Apr 29 11:54:59 2024 +0200
@@ -10,7 +10,13 @@
   tools:
     python: "3.11"
   apt_packages:
-    - python3-sphinxcontrib.plantuml
+  # python3-sphinxcontrib.plantuml install an old one version.
+  # Better to replace it by pip, so the requerments-file, which is already done
+  #  - python3-sphinxcontrib.plantuml
+  jobs:
+    post_install:
+      - mkdir -p ${READTHEDOCS_VIRTUALENV_PATH}/libexec
+      - curl  -o ${READTHEDOCS_VIRTUALENV_PATH}/libexec/plantuml.jar  -L https://github.com/plantuml/plantuml/releases/download/v1.2024.4/plantuml-1.2024.4.jar
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:

diff -r ab3fcb325f7e -r 88e0fcfa9ae2 conf.py
--- a/conf.py	Sun Apr 28 20:14:17 2024 +0200
+++ b/conf.py	Mon Apr 29 11:54:59 2024 +0200
@@ -72,13 +72,22 @@
 
 # plantUML
 #---------
+
 extensions.append('sphinxcontrib.plantuml')
 if on_rtd:
-    plantuml = 'java  -Djava.awt.headless=true  -jar /usr/share/plantuml/plantuml.jar'
+    if False: #old
+        plantuml = 'java  -Djava.awt.headless=true  -jar /usr/share/plantuml/plantuml.jar'
+    else:
+        #  in `.readthedocs.yaml`
+        #     post_install:
+        #      - curl -o ${READTHEDOCS_VIRTUALENV_PATH}/libexec/plantuml.jar -L https://github.com/plantuml/....
+        import os
+        _path=os.environ['READTHEDOCS_VIRTUALENV_PATH'] + '/libexec/'
+        plantuml = f'java  -Djava.awt.headless=true  -jar {_path}plantuml.jar'
 else:
 #    plantuml = 'java  -Djava.awt.headless=true  -jar /Users/albert/Apps/PlantUML/libexec/plantuml-RTfD.jar'  #plantuml.1.2020.2.jar
-    plantuml = 'plantuml'
-
+#    plantuml = 'plantuml'
+    plantuml = 'java  -Djava.awt.headless=true  -jar /Users/albert/Apps/PlantUML/libexec/plantuml-1.2024.4.jar' # NEW
 
 ##plantuml_output_format='svg_img'
 ## dito only can be png?