From 145c550dfb3ebaae0c794db92cd123313996eebe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jun 2026 05:52:35 +0000 Subject: [PATCH 1/4] Bump actions/cache from 5 to 6 Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17d83e8..408c650 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - - uses: actions/cache@v5 + - uses: actions/cache@v6 env: cache-name: cache-artifacts with: From 3b49b199dc6488f63f5e1c6f7f432f0bd06be21a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Jun 2026 08:11:33 +0000 Subject: [PATCH 2/4] Fix documentation build by replacing PyPlot with CairoMakie --- docs/Project.toml | 1 - docs/make.jl | 7 +++---- examples/examples3d.jl | 28 ++++++++++++---------------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/docs/Project.toml b/docs/Project.toml index b64a9dc..415e8aa 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -9,7 +9,6 @@ Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" PlutoSliderServer = "2fc8631c-6f24-4c5b-bca7-cbb509c42db4" PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8" PlutoVista = "646e1f28-b900-46d7-9d87-d554eb38a413" -PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" SimplexGridFactory = "57bfcd06-606e-45d6-baf4-4ba06da0efd5" TetGen = "c5d3f3f7-f850-59f6-8a2e-ffc6dc1317ea" diff --git a/docs/make.jl b/docs/make.jl index 6c77acb..fe580b2 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,8 +1,7 @@ using Documenter, SimplexGridFactory, ExtendableGrids import PlutoSliderServer using GridVisualize, ExampleJuggler -ENV["MPLBACKEND"] = "agg" -import CairoMakie, PyPlot +import CairoMakie ExampleJuggler.verbose!(true) @@ -13,9 +12,9 @@ function mkdocs() exampledir = joinpath(@__DIR__, "..", "examples") notebookdir = joinpath(@__DIR__, "..", "notebooks") cairo_examples = @docscripts(exampledir, ["examples2d.jl"], Plotter = CairoMakie) - pyplot_examples = @docscripts(exampledir, ["examples3d.jl"], Plotter = PyPlot) + cairo_3d_examples = @docscripts(exampledir, ["examples3d.jl"], Plotter = CairoMakie) - generated_examples = [cairo_examples..., pyplot_examples...] + generated_examples = [cairo_examples..., cairo_3d_examples...] notebook_examples = @docplutonotebooks(notebookdir, ["gridgenvis.jl", "cylinder.jl"], iframe = true, iframe_height = "2000px") diff --git a/examples/examples3d.jl b/examples/examples3d.jl index b99f31d..aba9f67 100644 --- a/examples/examples3d.jl +++ b/examples/examples3d.jl @@ -153,28 +153,24 @@ end # Plot generation using GridVisualize function generateplots(picdir; Plotter = nothing) - return if isdefined(Plotter, :gcf) + return if isdefined(Plotter, :Makie) size = (300, 300) + Plotter.activate!(; type = "png", visible = false) - Plotter.clf() - gridplot(tetrahedralization_of_cube(); Plotter, size, zplane = 0.5) - Plotter.savefig(joinpath(picdir, "tetrahedralization_of_cube.png")) + p = gridplot(tetrahedralization_of_cube(); Plotter, size, zplane = 0.5) + Plotter.save(joinpath(picdir, "tetrahedralization_of_cube.png"), p) - Plotter.clf() - gridplot(tet_cube_with_primitives(); Plotter, size, zplane = 5, azim = 47, elev = 80, interior = false) - Plotter.savefig(joinpath(picdir, "tet_cube_with_primitives.png")) + p = gridplot(tet_cube_with_primitives(); Plotter, size, zplane = 5, azim = 47, elev = 80, interior = false) + Plotter.save(joinpath(picdir, "tet_cube_with_primitives.png"), p) - Plotter.clf() - gridplot(glue_3d(); Plotter, size, azim = 0, elev = 15, xplanes = [5]) - Plotter.savefig(joinpath(picdir, "glue_3d.png")) + p = gridplot(glue_3d(); Plotter, size, azim = 0, elev = 15, xplanes = [5]) + Plotter.save(joinpath(picdir, "glue_3d.png"), p) - Plotter.clf() - gridplot(remesh_3d(); Plotter, size, zplanes = [0.5]) - Plotter.savefig(joinpath(picdir, "remesh_3d.png")) + p = gridplot(remesh_3d(); Plotter, size, zplanes = [0.5]) + Plotter.save(joinpath(picdir, "remesh_3d.png"), p) - Plotter.clf() - gridplot(stl_3d(); Plotter, size, xplanes = [5]) - Plotter.savefig(joinpath(picdir, "stl_3d.png")) + p = gridplot(stl_3d(); Plotter, size, xplanes = [5]) + Plotter.save(joinpath(picdir, "stl_3d.png"), p) end end From adbcc81b4834bd31aa546d178f639dceb5b2d6ed Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Jun 2026 08:14:37 +0000 Subject: [PATCH 3/4] Keep PyPlot, fix CI by installing matplotlib via Conda --- .github/workflows/ci.yml | 1 + docs/Project.toml | 1 + docs/make.jl | 7 ++++--- examples/examples3d.jl | 28 ++++++++++++++++------------ 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 408c650..e7e8eb2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,6 +71,7 @@ jobs: Pkg.instantiate()' env: PYTHON: "" + - run: julia -e 'using Conda; Conda.add("matplotlib")' # - run: | # julia --project=docs -e ' # using Documenter: doctest diff --git a/docs/Project.toml b/docs/Project.toml index 415e8aa..b64a9dc 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -9,6 +9,7 @@ Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" PlutoSliderServer = "2fc8631c-6f24-4c5b-bca7-cbb509c42db4" PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8" PlutoVista = "646e1f28-b900-46d7-9d87-d554eb38a413" +PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" SimplexGridFactory = "57bfcd06-606e-45d6-baf4-4ba06da0efd5" TetGen = "c5d3f3f7-f850-59f6-8a2e-ffc6dc1317ea" diff --git a/docs/make.jl b/docs/make.jl index fe580b2..6c77acb 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,7 +1,8 @@ using Documenter, SimplexGridFactory, ExtendableGrids import PlutoSliderServer using GridVisualize, ExampleJuggler -import CairoMakie +ENV["MPLBACKEND"] = "agg" +import CairoMakie, PyPlot ExampleJuggler.verbose!(true) @@ -12,9 +13,9 @@ function mkdocs() exampledir = joinpath(@__DIR__, "..", "examples") notebookdir = joinpath(@__DIR__, "..", "notebooks") cairo_examples = @docscripts(exampledir, ["examples2d.jl"], Plotter = CairoMakie) - cairo_3d_examples = @docscripts(exampledir, ["examples3d.jl"], Plotter = CairoMakie) + pyplot_examples = @docscripts(exampledir, ["examples3d.jl"], Plotter = PyPlot) - generated_examples = [cairo_examples..., cairo_3d_examples...] + generated_examples = [cairo_examples..., pyplot_examples...] notebook_examples = @docplutonotebooks(notebookdir, ["gridgenvis.jl", "cylinder.jl"], iframe = true, iframe_height = "2000px") diff --git a/examples/examples3d.jl b/examples/examples3d.jl index aba9f67..b99f31d 100644 --- a/examples/examples3d.jl +++ b/examples/examples3d.jl @@ -153,24 +153,28 @@ end # Plot generation using GridVisualize function generateplots(picdir; Plotter = nothing) - return if isdefined(Plotter, :Makie) + return if isdefined(Plotter, :gcf) size = (300, 300) - Plotter.activate!(; type = "png", visible = false) - p = gridplot(tetrahedralization_of_cube(); Plotter, size, zplane = 0.5) - Plotter.save(joinpath(picdir, "tetrahedralization_of_cube.png"), p) + Plotter.clf() + gridplot(tetrahedralization_of_cube(); Plotter, size, zplane = 0.5) + Plotter.savefig(joinpath(picdir, "tetrahedralization_of_cube.png")) - p = gridplot(tet_cube_with_primitives(); Plotter, size, zplane = 5, azim = 47, elev = 80, interior = false) - Plotter.save(joinpath(picdir, "tet_cube_with_primitives.png"), p) + Plotter.clf() + gridplot(tet_cube_with_primitives(); Plotter, size, zplane = 5, azim = 47, elev = 80, interior = false) + Plotter.savefig(joinpath(picdir, "tet_cube_with_primitives.png")) - p = gridplot(glue_3d(); Plotter, size, azim = 0, elev = 15, xplanes = [5]) - Plotter.save(joinpath(picdir, "glue_3d.png"), p) + Plotter.clf() + gridplot(glue_3d(); Plotter, size, azim = 0, elev = 15, xplanes = [5]) + Plotter.savefig(joinpath(picdir, "glue_3d.png")) - p = gridplot(remesh_3d(); Plotter, size, zplanes = [0.5]) - Plotter.save(joinpath(picdir, "remesh_3d.png"), p) + Plotter.clf() + gridplot(remesh_3d(); Plotter, size, zplanes = [0.5]) + Plotter.savefig(joinpath(picdir, "remesh_3d.png")) - p = gridplot(stl_3d(); Plotter, size, xplanes = [5]) - Plotter.save(joinpath(picdir, "stl_3d.png"), p) + Plotter.clf() + gridplot(stl_3d(); Plotter, size, xplanes = [5]) + Plotter.savefig(joinpath(picdir, "stl_3d.png")) end end From d1591d1c23a415d6a2b243baa32a0c89c6481e75 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Jun 2026 12:33:42 +0000 Subject: [PATCH 4/4] Fix Documentation CI: use --project=docs for Conda step, remove VoronoiFVM --- .github/workflows/ci.yml | 4 +++- docs/Project.toml | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7e8eb2..340d68d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,9 @@ jobs: Pkg.instantiate()' env: PYTHON: "" - - run: julia -e 'using Conda; Conda.add("matplotlib")' + - run: julia --project=docs -e 'using Conda; Conda.add("matplotlib")' + env: + PYTHON: "" # - run: | # julia --project=docs -e ' # using Documenter: doctest diff --git a/docs/Project.toml b/docs/Project.toml index b64a9dc..d9bc6b5 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -14,8 +14,6 @@ Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" SimplexGridFactory = "57bfcd06-606e-45d6-baf4-4ba06da0efd5" TetGen = "c5d3f3f7-f850-59f6-8a2e-ffc6dc1317ea" Triangulate = "f7e6ffb2-c36d-4f8f-a77e-16e897189344" -VoronoiFVM = "82b139dc-5afc-11e9-35da-9b9bdfd336f3" [compat] ExampleJuggler = "2" -VoronoiFVM = "1.21"