Bump Makie compat (#27)

* Bump Makie compat (where's compathelper?) * Remove deprecated names oops Move away from deprecated variable final * Updated GGThemr image * Bump version
MakieOrg · Feb 4, 2024 · 3d6b390 · 3d6b390 · asinghvi17 · Feb 4, 2024
1 parent f59ae3b
commit 3d6b390
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 *.jl.*.cov
 *.jl.mem
 /Manifest.toml
+img/demofigure/*.png
+img/demoscatter/*.png
diff --git a/Project.toml b/Project.toml
@@ -1,15 +1,15 @@
 name = "MakieThemes"
 uuid = "e296ed71-da82-5faf-88ab-0034a9761098"
 authors = ["Michael Krabbe Borregaard <mkborregaard@snm.ku.dk>", "Anshul Singhvi <anshul.singhvi@columbia.edu>", "JuliaPlots contributors"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [compat]
-Makie = "0.16, 0.17, 0.18, 0.19"
+Makie = "0.19, 0.20"
 Colors = "0.11, 0.12"
 julia = "1"
 

diff --git a/img/ggthemr_full_fresh.png b/img/ggthemr_full_fresh.png
diff --git a/src/GGThemr.jl b/src/GGThemr.jl
@@ -44,7 +44,7 @@ function style_ggthemr(basewidth = 2, spinewidth = basewidth * 0.75)
             zgridstyle = :dash,
         ),
         Legend = Attributes(
-            bgcolor = :transparent,
+            backgroundcolor = :transparent,
             framevisible = false,
         ),
         Scatter = Attributes(
@@ -61,7 +61,7 @@ function color_ggthemr(theme::Symbol)
         color = ct[:swatch][2:end],
         patchcolor = ct[:swatch][2:end],
       ),
-      Makie.default_palettes, 
+      Makie.DEFAULT_PALETTES, 
     )
 
     Attributes(

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -11,12 +11,14 @@ using AlgebraOfGraphics
   mkpath(joinpath(dirname(@__DIR__), "img", "demofigure"))
   mkpath(joinpath(dirname(@__DIR__), "img", "demoscatter"))
 
-  fig = MakieThemes.demofigure(Makie.minimal_default)
+  fig = MakieThemes.demofigure()
   save(joinpath(dirname(@__DIR__), "img", "demofigure", "default.png"), fig; px_per_unit = 2)
 
-  fig = MakieThemes.demoscatter(Makie.minimal_default)
+  fig = MakieThemes.demoscatter()
   save(joinpath(dirname(@__DIR__), "img", "demoscatter", "default.png"), fig; px_per_unit = 2)
 
+  old_theme = deepcopy(Makie.current_default_theme())
+
 
   for i in ggthemr_colorthemes()
     @test_nowarn begin
@@ -26,7 +28,7 @@ using AlgebraOfGraphics
         fig = MakieThemes.demoscatter(theme_ggthemr(i))
         save(joinpath(dirname(@__DIR__), "img", "demoscatter", "$i.png"), fig; px_per_unit = 2)
 
-        Makie.set_theme!(Makie.minimal_default)
+        Makie.set_theme!(old_theme)
     end
   end
   fig = MakieThemes.demofigure(theme_bbc())
@@ -36,7 +38,7 @@ using AlgebraOfGraphics
   fig = MakieThemes.demoscatter(theme_bbc())
   save(joinpath(dirname(@__DIR__), "img", "demoscatter", "bbc.png"), fig; px_per_unit = 2)
 
-  Makie.set_theme!(Makie.minimal_default)
+  Makie.set_theme!(old_theme)
 end
 
 @testset "GGthemr" begin
@@ -69,4 +71,4 @@ end
 
     end
   end
-end
+end