修订版 | 07612377f02795d6b2b3ea160355fe7136d49115 (tree) |
---|---|
时间 | 2024-04-29 19:47:06 |
作者 | Albert Mietus < albert AT mietus DOT nl > |
Commiter | Albert Mietus < albert AT mietus DOT nl > |
RTD: last try worked, Now: cleanu ( and test)
@@ -11,11 +11,14 @@ | ||
11 | 11 | # python: "3.11" |
12 | 12 | python: "3.9" |
13 | 13 | apt_packages: |
14 | - # python3-sphinxcontrib.plantuml install an old one version. | |
15 | - # Better to replace it by pip, so the requerments-file, which is already done | |
14 | + # python3-sphinxcontrib.plantuml installs an old version of plantuml ... | |
15 | + # But is needed, to install dependencies .. | |
16 | + # Below, an other plantUML jar is installed | |
17 | + # (Both are needed ... it also in the requerments-file, but needed here) | |
16 | 18 | - python3-sphinxcontrib.plantuml |
17 | 19 | jobs: |
18 | 20 | post_install: |
21 | + # Install a newer version op plantuml -- keep in sync witch 'conf.py'! | |
19 | 22 | - mkdir -p ${READTHEDOCS_VIRTUALENV_PATH}/libexec |
20 | 23 | - curl -o ${READTHEDOCS_VIRTUALENV_PATH}/libexec/plantuml.jar -L https://github.com/plantuml/plantuml/releases/download/v1.2024.4/plantuml-1.2024.4.jar |
21 | 24 |
@@ -74,23 +74,19 @@ | ||
74 | 74 | #--------- |
75 | 75 | |
76 | 76 | extensions.append('sphinxcontrib.plantuml') |
77 | -if True or on_rtd: | |
78 | - print('DEBUG: on_rtd') | |
79 | - if False: #old | |
80 | - plantuml = 'java -Djava.awt.headless=true -jar /usr/share/plantuml/plantuml.jar' | |
81 | - else: | |
82 | - # in `.readthedocs.yaml` | |
83 | - # post_install: | |
84 | - # - curl -o ${READTHEDOCS_VIRTUALENV_PATH}/libexec/plantuml.jar -L https://github.com/plantuml/.... | |
85 | - import os | |
86 | - _path=os.environ['READTHEDOCS_VIRTUALENV_PATH'] + '/libexec/' | |
87 | - plantuml = f'java -Djava.awt.headless=true -jar {_path}plantuml.jar' | |
88 | - print(f'DEBUG: plantuml={plantuml}') | |
77 | +if on_rtd: | |
78 | + # in `.readthedocs.yaml` | |
79 | + # post_install: | |
80 | + # - curl -o ${READTHEDOCS_VIRTUALENV_PATH}/libexec/plantuml.jar -L https://github.com/plantuml/.... | |
81 | + # Make use of that plantUML version | |
82 | + import os | |
83 | + _path=os.environ['READTHEDOCS_VIRTUALENV_PATH'] + '/libexec/' | |
84 | + plantuml = f'java -Djava.awt.headless=true -jar {_path}plantuml.jar' | |
85 | + #print(f'DEBUG: plantuml={plantuml}') | |
89 | 86 | else: #local |
90 | -# plantuml = 'java -Djava.awt.headless=true -jar /Users/albert/Apps/PlantUML/libexec/plantuml-RTfD.jar' #plantuml.1.2020.2.jar | |
91 | -# plantuml = 'plantuml' | |
92 | 87 | plantuml = 'java -Djava.awt.headless=true -jar /Users/albert/Apps/PlantUML/libexec/plantuml-1.2024.4.jar' # NEW |
93 | 88 | |
89 | + | |
94 | 90 | ##plantuml_output_format='svg_img' |
95 | 91 | ## dito only can be png? |
96 | 92 | plantuml_output_format='png' |