Merge pull request #78 from JuliaPlots/as/pixeltype

Compatibility with Makie 0.17
MakieOrg · May 12, 2022 · 8bae63f · 8bae63f
2 parents 2434a0b + b8ba9ad
commit 8bae63f
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -14,7 +14,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 [compat]
 GeometryBasics = "0.4"
 Graphs = "1.4"
-Makie = "0.15, 0.16.4"
+Makie = "0.17"
 NetworkLayout = "0.4.3"
 StaticArrays = "1.2"
 julia = "1"

diff --git a/assets/plots.jl-04.png b/assets/plots.jl-04.png
diff --git a/assets/plots.jl-05.png b/assets/plots.jl-05.png
diff --git a/assets/plots.jl-06.png b/assets/plots.jl-06.png
diff --git a/assets/plots.jl-07.png b/assets/plots.jl-07.png
diff --git a/assets/plots.jl-12.png b/assets/plots.jl-12.png
diff --git a/assets/plots.jl-13.png b/assets/plots.jl-13.png
diff --git a/assets/plots.jl-14.png b/assets/plots.jl-14.png
diff --git a/assets/plots.jl-15.png b/assets/plots.jl-15.png
diff --git a/assets/reftests.jl-01.png b/assets/reftests.jl-01.png
diff --git a/assets/reftests.jl-02.png b/assets/reftests.jl-02.png
diff --git a/assets/reftests.jl-03.png b/assets/reftests.jl-03.png
diff --git a/assets/reftests.jl-04.png b/assets/reftests.jl-04.png
diff --git a/assets/reftests.jl-05.png b/assets/reftests.jl-05.png
diff --git a/assets/reftests.jl-06.png b/assets/reftests.jl-06.png
diff --git a/assets/reftests.jl-07.png b/assets/reftests.jl-07.png
diff --git a/assets/syntaxtree.jl-01.png b/assets/syntaxtree.jl-01.png
diff --git a/assets/syntaxtree.jl-02.png b/assets/syntaxtree.jl-02.png
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -1,5 +1,6 @@
 [deps]
 CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
+Cbc = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 GraphMakie = "1ecd5474-83a3-4783-bb4f-06765db800d2"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
@@ -14,5 +15,6 @@ PkgDeps = "839e9fc8-855b-5b3c-a3b7-2833d3dd1f59"
 WGLMakie = "276b4fcb-3e11-5398-bf8b-a0c2d153d008"
 
 [compat]
+Cbc = "1.0.1"
 LayeredLayouts = "0.2"
 NetworkDynamics = "0.7"
diff --git a/src/recipes.jl b/src/recipes.jl
@@ -221,7 +221,7 @@ function Makie.plot!(gp::GraphPlot)
                            color = gp.edge_color,
                            rotations = arrow_rot,
                            strokewidth = 0.0,
-                           markerspace = Pixel,
+                           markerspace = :pixel,
                            visible = arrow_show,
                            gp.arrow_attr...)