From 80acb2365cc9d098af97fb6a0ea60ee91c2e1f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Morais?= Date: Mon, 10 Nov 2025 16:16:48 +0100 Subject: [PATCH 1/6] chore: rework logic around vtk-osmesa --- .github/workflows/ci_cd.yml | 7 ++----- .github/workflows/nightly.yml | 7 ++----- doc/Makefile | 13 ++----------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 11af18b2d..40d469c61 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -127,11 +127,8 @@ jobs: steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - name: Installing OS packages - shell: bash - run: | - sudo apt-get update - sudo apt install -y libgl1 libglx-mesa0 xvfb libgomp1 + - name: Set up headless display + uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2 - name: Set up Python uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d01e00c0d..1c55177b8 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,11 +22,8 @@ jobs: steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - name: Installing OS packages - shell: bash - run: | - sudo apt-get update - sudo apt install -y libgl1 libglx-mesa0 xvfb libgomp1 + - name: Set up headless display + uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0 diff --git a/doc/Makefile b/doc/Makefile index c43ba4e1b..c425063e6 100755 --- a/doc/Makefile +++ b/doc/Makefile @@ -14,18 +14,9 @@ help: .PHONY: help Makefile -.install-ci-dep: - @pip freeze | grep -q "vtk-osmesa" && is_vtk_osmesa_installed="yes" || is_vtk_osmesa_installed="no" - @if [ "${ON_CI}" = "true" ] && [ "$$is_vtk_osmesa_installed" != "yes" ]; then \ - @echo "Removing package(s) to avoid conflicts with package(s) needed for CI/CD"; \ - pip uninstall --yes vtk; \ - @echo "Installing CI/CD required package(s)"; \ - pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1; \ - fi - # Catch-all target: route all unknown targets to Sphinx using the new # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). -%: .install-ci-dep Makefile +%: @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) @@ -41,5 +32,5 @@ pdf: (test -f $(BUILDDIR)/latex/*.pdf && echo pdf exists) || exit 1 # Build HTML files and generate examples as .py files -html: .install-ci-dep +html: @$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) From 447ca391e82173a01ed77f2561a9f746fbf05fef Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com> Date: Mon, 10 Nov 2025 15:20:55 +0000 Subject: [PATCH 2/6] chore: adding changelog file 774.maintenance.md [dependabot-skip] --- doc/changelog.d/774.maintenance.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/changelog.d/774.maintenance.md diff --git a/doc/changelog.d/774.maintenance.md b/doc/changelog.d/774.maintenance.md new file mode 100644 index 000000000..4ef58d81c --- /dev/null +++ b/doc/changelog.d/774.maintenance.md @@ -0,0 +1 @@ +Rework logic around vtk-osmesa From dce213fb5229e6099688b5e865153e3f3e3bee22 Mon Sep 17 00:00:00 2001 From: sthoene Date: Tue, 16 Dec 2025 14:59:44 +0100 Subject: [PATCH 3/6] remove xvfb-run from pytest --- .github/workflows/ci_cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 40d469c61..30e52f4cc 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -168,7 +168,7 @@ jobs: shell: bash run: | . .venv/bin/activate - xvfb-run pytest -xs + pytest -xs - name: Upload Coverage Results if: always() From fb8b8953dbda488b57f3b3ea48c3e37056a61cc3 Mon Sep 17 00:00:00 2001 From: sthoene Date: Tue, 16 Dec 2025 15:22:00 +0100 Subject: [PATCH 4/6] fix asset issue --- doc/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index dac9a5470..bacb14d45 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -298,7 +298,7 @@ def copy_assets_to_output_dir(app: sphinx.application.Sphinx, exception: Excepti if app.builder.name == "html": SOURCE_ASSETS = pathlib.Path(app.outdir) / "_static" / "assets" / "download" ASSETS_DIRECTORY = pathlib.Path(app.outdir).parent.parent.parent / "tests" / "assets" - + SOURCE_ASSETS.mkdir(exist_ok=True) logger.info("Extracting assets to output directory...") zip_path = pathlib.Path(shutil.make_archive("assets", "zip", ASSETS_DIRECTORY)) zip_path = shutil.move(zip_path, SOURCE_ASSETS / zip_path.name) From 3b2a2d0e841c87d677177b5c51beb0ab7cd70dcf Mon Sep 17 00:00:00 2001 From: sthoene Date: Tue, 16 Dec 2025 15:37:13 +0100 Subject: [PATCH 5/6] debug logging --- doc/source/conf.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index bacb14d45..517b829df 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -298,9 +298,11 @@ def copy_assets_to_output_dir(app: sphinx.application.Sphinx, exception: Excepti if app.builder.name == "html": SOURCE_ASSETS = pathlib.Path(app.outdir) / "_static" / "assets" / "download" ASSETS_DIRECTORY = pathlib.Path(app.outdir).parent.parent.parent / "tests" / "assets" - SOURCE_ASSETS.mkdir(exist_ok=True) + SOURCE_ASSETS.mkdir(parents=True, exist_ok=True) logger.info("Extracting assets to output directory...") + logger.info(f"Folder created: {str(SOURCE_ASSETS.exists())}") zip_path = pathlib.Path(shutil.make_archive("assets", "zip", ASSETS_DIRECTORY)) + logger.info("ZIP created") zip_path = shutil.move(zip_path, SOURCE_ASSETS / zip_path.name) logger.info(f"Extracted assets to {zip_path}.") else: From b991486b03a724a83746c0df5cc003f0d886029d Mon Sep 17 00:00:00 2001 From: sthoene Date: Wed, 17 Dec 2025 12:44:33 +0100 Subject: [PATCH 6/6] add message size to doc --- .github/workflows/ci_cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index e1c03df55..24045ac23 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -102,7 +102,7 @@ jobs: env: ANSYSLMD_LICENSE_FILE: 1055@${{ secrets.LICENSE_SERVER }} run: | - docker run --detach --name speos-rpc -p 127.0.0.1:50098:50098 -e SPEOS_LOG_LEVEL=2 -e ANSYSLMD_LICENSE_FILE=${{ env.ANSYSLMD_LICENSE_FILE }} -v "${{ github.workspace }}/tests/assets:/app/assets" --entrypoint /app/SpeosRPC_Server.x ghcr.io/ansys/speos-rpc:dev --transport_insecure --host 0.0.0.0 + docker run --detach --name speos-rpc -p 127.0.0.1:50098:50098 -e SPEOS_LOG_LEVEL=2 -e ANSYSLMD_LICENSE_FILE=${{ env.ANSYSLMD_LICENSE_FILE }} -v "${{ github.workspace }}/tests/assets:/app/assets" --entrypoint /app/SpeosRPC_Server.x ghcr.io/ansys/speos-rpc:dev --transport_insecure -m 25000000 --host 0.0.0.0 - name: "Run Ansys documentation building action" uses: ansys/actions/doc-build@41f86da4c9ead510db9135e428e33df9cc6f92e1 # v10.2.3 with: