Merge branch 'master' into ff/breaking-0.25

ffreyer · web-flow · commit e7ef7e92b71e · 2026-03-06T14:19:23.000+01:00
diff --git a/.github/workflows/Docs.yml b/.github/workflows/Docs.yml
@@ -48,7 +48,7 @@ jobs:
           DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24'
           julia --color=yes makedocs.jl
     - name: Upload site as artifact
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: Docs build
         path: ./docs/build
diff --git a/.github/workflows/compilation-benchmark.yaml b/.github/workflows/compilation-benchmark.yaml
@@ -40,7 +40,7 @@ jobs:
         run: >
           DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --project=./metrics/ttfp/ ./metrics/ttfp/run-benchmark.jl ${{ matrix.package }} 20 ${{ github.event.pull_request.base.ref }}
       - name: Upload plots as artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ matrix.package }}
           path: ./benchmark_results
@@ -66,7 +66,7 @@ jobs:
 
       - name: Download artifacts
         if: steps.check_token.outputs.has_token == 'true'
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           path: ./images
           merge-multiple: true
diff --git a/.github/workflows/reference_images_site.yml b/.github/workflows/reference_images_site.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Download ReferenceImages artifact
         if: steps.pr_number.outputs.pr != ''
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: ReferenceImages
           path: ./reference_images_data
diff --git a/.github/workflows/reference_tests.yml b/.github/workflows/reference_tests.yml
@@ -54,7 +54,7 @@ jobs:
           julia --color=yes --project=monorepo -e 'using Pkg; Pkg.test("CairoMakie", coverage=true)'
           && echo "TESTS_SUCCESSFUL=true" >> $GITHUB_ENV
       - name: Upload test Artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ReferenceImages_CairoMakie_${{ matrix.version }}
           path: ./CairoMakie/test/reference_images/
@@ -107,7 +107,7 @@ jobs:
           DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=monorepo -e 'using Pkg; Pkg.test("GLMakie", coverage=true)'
           && echo "TESTS_SUCCESSFUL=true" >> $GITHUB_ENV
       - name: Upload test Artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ReferenceImages_GLMakie_${{ matrix.version }}
           path: |
@@ -158,12 +158,12 @@ jobs:
           DISPLAY=:0 xvfb-run -s '-screen 0 2048x2048x24' julia --color=yes --project=monorepo -e 'using Pkg; Pkg.test("WGLMakie", coverage=true)'
           && echo "TESTS_SUCCESSFUL=true" >> $GITHUB_ENV
       - name: Upload test Artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ReferenceImages_WGLMakie_${{ matrix.version }}
           path: ./WGLMakie/test/reference_images/
       - name: Upload test Electron logs
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: Electron_Logs_WGLMakie_${{ matrix.version }}
           path: ./WGLMakie/test/electron.log
@@ -183,15 +183,15 @@ jobs:
     if: ${{ always() }} # run even if any of the three backend test jobs failed
     needs: [cairomakie, glmakie, wglmakie]
     steps:
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: ReferenceImages_WGLMakie_1
           path: ./ReferenceImages/WGLMakie
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: ReferenceImages_CairoMakie_1
           path: ./ReferenceImages/CairoMakie
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: ReferenceImages_GLMakie_1
           path: ./ReferenceImages/GLMakie
@@ -222,7 +222,7 @@ jobs:
           done
 
           echo "Files and folders have been successfully combined into ReferenceImagesCombined."
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7
         with:
           name: ReferenceImages
           path: ./ReferenceImagesCombined/
@@ -235,7 +235,7 @@ jobs:
           echo $N_MISSING > ./n_missing/n_missing_refimages
           echo $COMMIT_SHA >> ./n_missing/n_missing_refimages
       - name: Upload artifact with number of missing refimages
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: n_missing_refimages
           path: n_missing/
diff --git a/.github/workflows/rprmakie.yaml b/.github/workflows/rprmakie.yaml
@@ -52,7 +52,7 @@ jobs:
           julia --color=yes --project=monorepo -e 'using Pkg; Pkg.test("RPRMakie", coverage=true)'
           && echo "TESTS_SUCCESSFUL=true" >> $GITHUB_ENV
       - name: Upload test Artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ReferenceImages_${{ matrix.os }}_${{ matrix.arch }}_${{ matrix.version }}
           path: ./RPRMakie/test/recorded
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,7 +29,10 @@
 
 ## Unreleased
 
+## [0.24.9] - 2026-03-04
+
 - Added loading spinner in WGLMakie that displays while the plot is being loaded [#5469](https://github.com/MakieOrg/Makie.jl/pull/5469)
+- Fixed cycling not working in `PlotList`s [#5541](https://github.com/MakieOrg/Makie.jl/pull/5541)
 - Moved decoration plots in `Axis3` to `ax.blockscene` so they no longer show up as user plots in the Axis3 [#5463](https://github.com/MakieOrg/Makie.jl/pull/5463)
 
 - Fixed issue with `transformation` being applied multiple times when set by a user in a recipe that passes applicable attributes to child plots [#5464](https://github.com/MakieOrg/Makie.jl/pull/5464)
@@ -1016,7 +1019,8 @@ All other changes are collected [in this PR](https://github.com/MakieOrg/Makie.j
 - Fixed rendering of `heatmap`s with one or more reversed ranges in CairoMakie, as in `heatmap(1:10, 10:-1:1, rand(10, 10))` [#1100](https://github.com/MakieOrg/Makie.jl/pull/1100).
 - Fixed volume slice recipe and added docs for it [#1123](https://github.com/MakieOrg/Makie.jl/pull/1123).
 
-[Unreleased]: https://github.com/MakieOrg/Makie.jl/compare/v0.24.8...HEAD
+[Unreleased]: https://github.com/MakieOrg/Makie.jl/compare/v0.24.9...HEAD
+[0.24.9]: https://github.com/MakieOrg/Makie.jl/compare/v0.24.8...v0.24.9
 [0.24.8]: https://github.com/MakieOrg/Makie.jl/compare/v0.24.7...v0.24.8
 [0.24.7]: https://github.com/MakieOrg/Makie.jl/compare/v0.24.6...v0.24.7
 [0.24.6]: https://github.com/MakieOrg/Makie.jl/compare/v0.24.5...v0.24.6
diff --git a/CairoMakie/Project.toml b/CairoMakie/Project.toml
@@ -1,7 +1,11 @@
 name = "CairoMakie"
 uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 author = ["Simon Danisch <sdanisch@gmail.com>"]
+<<<<<<< ff/breaking-0.25
 version = "0.16.0"
+=======
+version = "0.15.9"
+>>>>>>> master
 
 [deps]
 CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
@@ -27,6 +31,10 @@ FileIO = "1.1"
 FreeType = "3, 4.0"
 GeometryBasics = "0.5"
 LinearAlgebra = "1.0, 1.6"
+<<<<<<< ff/breaking-0.25
 Makie = "=0.25.0"
+=======
+Makie = "=0.24.9"
+>>>>>>> master
 PrecompileTools = "1.0"
 julia = "1.3"
diff --git a/ComputePipeline/Project.toml b/ComputePipeline/Project.toml
@@ -1,7 +1,7 @@
 name = "ComputePipeline"
 uuid = "95dc2771-c249-4cd0-9c9f-1f3b4330693c"
 authors = ["Simon Danisch", "Frederic Freyer", "MakieOrg"]
-version = "0.1.6"
+version = "0.1.7"
 
 [deps]
 Observables = "510215fc-4207-5dde-b226-833fc4488ee2"
diff --git a/GLMakie/Project.toml b/GLMakie/Project.toml
@@ -1,6 +1,10 @@
 name = "GLMakie"
 uuid = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
+<<<<<<< ff/breaking-0.25
 version = "0.14.0"
+=======
+version = "0.13.9"
+>>>>>>> master
 
 [deps]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
@@ -33,7 +37,11 @@ FreeTypeAbstraction = "0.10"
 GLFW = "3.4.3"
 GeometryBasics = "0.5"
 LinearAlgebra = "1.0, 1.6"
+<<<<<<< ff/breaking-0.25
 Makie = "=0.25.0"
+=======
+Makie = "=0.24.9"
+>>>>>>> master
 Markdown = "1.0, 1.6"
 MeshIO = "0.5"
 ModernGL = "1"
diff --git a/Makie/Project.toml b/Makie/Project.toml
@@ -1,7 +1,11 @@
 name = "Makie"
 uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 authors = ["Simon Danisch", "Julius Krumbiegel"]
+<<<<<<< ff/breaking-0.25
 version = "0.25.0"
+=======
+version = "0.24.9"
+>>>>>>> master
 
 [deps]
 Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340"
@@ -82,7 +86,7 @@ ColorBrewer = "0.4"
 ColorSchemes = "3.5"
 ColorTypes = "0.8, 0.9, 0.10, 0.11, 0.12"
 Colors = "0.9, 0.10, 0.11, 0.12, 0.13"
-ComputePipeline = "0.1.6"
+ComputePipeline = "0.1.7"
 Contour = "0.5, 0.6"
 DelaunayTriangulation = "1.0"
 Distributions = "0.17, 0.18, 0.19, 0.20, 0.21, 0.22, 0.23, 0.24, 0.25"
diff --git a/Makie/src/compute-plots.jl b/Makie/src/compute-plots.jl
@@ -1090,26 +1090,35 @@ function Plot{Func}(user_args::Tuple, user_attributes::Dict) where {Func}
     return Plot{FinalPlotFunc, ArgTyp}(user_attributes, attr)
 end
 
-function plot_cycle_index(scene::Scene, plot::Plot)
+# Count cycling position of `plot` among the top-level plots in `plot_iter`.
+# PlotList entries are expanded into their children so they participate in cycling.
+function _cycle_position(plot::Plot, plot_iter)
     cycle = plot.cycle[]
     isnothing(cycle) && return 0
     syms = [s for ps in attrsyms(cycle) for s in ps]
     pos = 1
-    for p in scene.plots
-        p === plot && return pos
-        if haskey(p, :cycle) && !isnothing(p.cycle[]) && plotfunc(p) === plotfunc(plot)
-            is_cycling = any(syms) do x
-                return haskey(p.attributes.inputs, x) && isnothing(p.attributes.inputs[x].value)
-            end
-            if is_cycling
-                pos += 1
+    for p in plot_iter
+        children = p isa PlotList ? p.plots : (p,)
+        for cp in children
+            cp === plot && return pos
+            if haskey(cp, :cycle) && !isnothing(cp.cycle[]) && plotfunc(cp) === plotfunc(plot)
+                is_cycling = any(syms) do x
+                    return haskey(cp.attributes.inputs, x) && isnothing(cp.attributes.inputs[x].value)
+                end
+                if is_cycling
+                    pos += 1
+                end
             end
         end
     end
     # not inserted yet
     return pos
 end
 
+function plot_cycle_index(scene::Scene, plot::Plot)
+    return _cycle_position(plot, scene.plots)
+end
+
 # For recipes we use the recipes position?
 function plot_cycle_index(parent::Plot, ::Plot)
     return plot_cycle_index(get_scene(parent), parent)
diff --git a/Makie/src/makielayout/blocks/axis.jl b/Makie/src/makielayout/blocks/axis.jl
@@ -1841,7 +1841,7 @@ function attribute_examples(::Type{Axis})
                     yticks = [-100, -10, 0, 10, 100]
                 )
 
-                ax3 = Axis(f[1, 1],
+                ax3 = Axis(f[3, 1],
                     yscale = Makie.pseudolog10,
                     title = "Pseudolog scale with LogTicks",
                     yticks = LogTicks(-2:2)
diff --git a/Makie/src/specapi.jl b/Makie/src/specapi.jl
@@ -619,24 +619,14 @@ function push_without_add!(scene::Scene, plot)
     return
 end
 
-function plot_cycle_index(specs, spec::PlotSpec, plot::Plot)
-    cycle = plot.cycle[]
-    isnothing(cycle) && return 0
-    syms = [s for ps in attrsyms(cycle) for s in ps]
-    pos = 1
-    for p in specs
-        p === spec && return pos
-        if haskey(p.kwargs, :cycle) && !isnothing(p.kwargs[:cycle]) && plotfunc(p) === plotfunc(spec)
-            is_cycling = any(syms) do x
-                return haskey(p.kwargs, x) && isnothing(p[x])
-            end
-            if is_cycling
-                pos += 1
-            end
-        end
-    end
-    # not inserted yet
-    return pos
+# PlotList children each get their own cycle position (unlike other recipes
+# where children inherit the recipe's position). The plotlist may not be in
+# scene.plots yet during initial creation, so we chain it onto the iterator;
+# the identity short-circuit in _cycle_position prevents double-counting
+# if it IS already there.
+function plot_cycle_index(parent::PlotList, plot::Plot)
+    scene = get_scene(parent)
+    return _cycle_position(plot, Iterators.flatten((scene.plots, (parent,))))
 end
 
 function diff_plotlist!(
@@ -658,16 +648,16 @@ function diff_plotlist!(
         if !isnothing(plotlist)
             merge!(plotspec.kwargs, plotlist.kw)
         end
+        # Use plotlist as parent so connect_plot! computes the correct
+        # cycle_index via plot_cycle_index(::PlotList, ::Plot).
+        parent = isnothing(plotlist) ? scene : plotlist
         if isnothing(reused_plot)
-            # Create new plot, store it into our `cached_plots` dictionary
             @debug("Creating new plot for spec")
-            # This is all pretty much `push!(scene, plot)` / `plot!(scene, plotobject)`
-            # But we want the scene to only contain one PlotList item with the newly created
-            # Plots from the plotlist to only appear as children of the PlotList recipe
-            # - so we dont push it to the scene if there's a plotlist.
-            # This avoids e.g. double legend entries, due to having the children + plotlist in the same scene without being nested.
             plot_obj = to_plot_object(plotspec)
-            connect_plot!(scene, plot_obj)
+            # connect_plot! sets cycle_index correctly via plot_cycle_index(parent, plot).
+            # We don't push to scene.plots when there's a plotlist — the scene should
+            # only contain the PlotList itself, to avoid e.g. double legend entries.
+            connect_plot!(parent, plot_obj)
             if !isnothing(plotlist)
                 push!(plotlist.plots, plot_obj)
             else
@@ -677,11 +667,9 @@ function diff_plotlist!(
             new_plots[plotspec] = plot_obj
         else
             @debug("updating old plot with spec")
-            # Delete the plots from reusable_plots, so that we don't reuse it multiple times!
             delete!(reusable_plots, old_spec)
             deleteat!(reusable_plots_sorted, idx)
-            # Update the position of the plot!
-            pos = plot_cycle_index(plotspecs, plotspec, reused_plot)
+            pos = plot_cycle_index(parent, reused_plot)
             if pos != reused_plot.cycle_index[]
                 reused_plot.cycle_index = pos
             end
diff --git a/RPRMakie/Project.toml b/RPRMakie/Project.toml
@@ -1,7 +1,11 @@
 name = "RPRMakie"
 uuid = "22d9f318-5e34-4b44-b769-6e3734a732a6"
 authors = ["Simon Danisch"]
+<<<<<<< ff/breaking-0.25
 version = "0.11.0"
+=======
+version = "0.10.9"
+>>>>>>> master
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -20,7 +24,11 @@ Colors = "0.9, 0.10, 0.11, 0.12, 0.13"
 FileIO = "1.6"
 GeometryBasics = "0.5"
 LinearAlgebra = "1.0, 1.6"
+<<<<<<< ff/breaking-0.25
 Makie = "=0.25.0"
+=======
+Makie = "=0.24.9"
+>>>>>>> master
 Printf = "1.0, 1.6"
 RadeonProRender = "0.3.2"
 julia = "1.3"
diff --git a/docs/src/explanations/backends/rprmakie.md b/docs/src/explanations/backends/rprmakie.md
