From e8b1ada0345cfebef114be555e770fd594155b16 Mon Sep 17 00:00:00 2001 From: AngRodrigues Date: Tue, 14 May 2024 11:09:01 +1000 Subject: [PATCH 1/3] docs: remove lavavu; no need for 3D vis for the examples --- docs/Dockerfile | 5 +---- docs/source/conf.py | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/docs/Dockerfile b/docs/Dockerfile index 0fb83117..c3165b30 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -27,12 +27,9 @@ RUN conda install -c conda-forge --file ./docs/requirements.txt -y RUN pip install . -# RUN pip install lavavu-osmesa==1.8.45 -ENV LD_LIBRARY_PATH=/opt/conda/lib/python3.10/site-packages/lavavu_osmesa.libs - ENV TINI_VERSION v0.19.0 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini RUN chmod +x /tini -# ENTRYPOINT ["/tini", "--"] +ENTRYPOINT ["/tini", "--"] WORKDIR / \ No newline at end of file diff --git a/docs/source/conf.py b/docs/source/conf.py index afc40e0d..ce0bf2d7 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -105,19 +105,17 @@ # Sphinx gallery examples -try: - from LoopStructural.visualisation.sphinx_scraper import Scraper as LoopScraper - from sphinx_gallery.sorting import ExampleTitleSortKey - - sphinx_gallery_conf = { - "examples_dirs": ["../examples/"], - "gallery_dirs": ["_auto_examples/"], # path to where to save gallery generated output - "image_scrapers": ("matplotlib", LoopScraper()), - "within_subsection_order": ExampleTitleSortKey, - "reference_url": {"LoopStructural": None}, - } -except ImportError: - pass + +# from LoopStructural.visualisation.sphinx_scraper import Scraper as LoopScraper +from sphinx_gallery.sorting import ExampleTitleSortKey + +sphinx_gallery_conf = { + "examples_dirs": ["../examples/"], + "gallery_dirs": ["_auto_examples/"], # path to where to save gallery generated output + "image_scrapers": ("matplotlib"), + "within_subsection_order": ExampleTitleSortKey, + "reference_url": {"LoopStructural": None}, +} # def setup(app): # app.add_stylesheet('custom.css') From 1f29261eeca0a8ec8f4c2a1f953c820687446e7e Mon Sep 17 00:00:00 2001 From: AngRodrigues Date: Tue, 14 May 2024 01:09:23 +0000 Subject: [PATCH 2/3] style: style fixes by ruff and autoformatting by black --- docs/source/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index ce0bf2d7..e5edd5e6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -105,7 +105,6 @@ # Sphinx gallery examples - # from LoopStructural.visualisation.sphinx_scraper import Scraper as LoopScraper from sphinx_gallery.sorting import ExampleTitleSortKey From 89fd60f35445f96894c153d3f8c5f6451bcbf0ed Mon Sep 17 00:00:00 2001 From: AngRodrigues Date: Tue, 14 May 2024 13:14:39 +1000 Subject: [PATCH 3/3] fix: remove tini from docker --- docs/Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/Dockerfile b/docs/Dockerfile index c3165b30..86879a31 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -27,9 +27,4 @@ RUN conda install -c conda-forge --file ./docs/requirements.txt -y RUN pip install . -ENV TINI_VERSION v0.19.0 -ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini -RUN chmod +x /tini -ENTRYPOINT ["/tini", "--"] - WORKDIR / \ No newline at end of file