From 58fc47547dbd448e29a5c052d67dee0c2b64fd40 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 17 Jan 2025 17:16:41 +0100 Subject: [PATCH 1/2] tag 0.22.1 (#4734) --- CHANGELOG.md | 5 ++++- CairoMakie/Project.toml | 4 ++-- GLMakie/Project.toml | 4 ++-- Project.toml | 2 +- RPRMakie/Project.toml | 4 ++-- WGLMakie/Project.toml | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef019d6f95..fed9cc66f16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [Unreleased] +## [0.22.1] - 2025-01-17 + - Allow volume textures for mesh color, to e.g. implement a performant volume slice display [#2274](https://github.com/MakieOrg/Makie.jl/pull/2274). - Fix `alpha` use in legends and some CairoMakie cases [#4721](https://github.com/MakieOrg/Makie.jl/pull/4721). @@ -723,7 +725,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.22.0...HEAD +[Unreleased]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.1...HEAD +[0.22.1]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.0...v0.22.1 [0.22.0]: https://github.com/MakieOrg/Makie.jl/compare/v0.21.18...v0.22.0 [0.21.18]: https://github.com/MakieOrg/Makie.jl/compare/v0.21.17...v0.21.18 [0.21.17]: https://github.com/MakieOrg/Makie.jl/compare/v0.21.16...v0.21.17 diff --git a/CairoMakie/Project.toml b/CairoMakie/Project.toml index c625c631b3b..15d58ec128a 100644 --- a/CairoMakie/Project.toml +++ b/CairoMakie/Project.toml @@ -1,7 +1,7 @@ name = "CairoMakie" uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" author = ["Simon Danisch "] -version = "0.13.0" +version = "0.13.1" [deps] CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc" @@ -24,7 +24,7 @@ FileIO = "1.1" FreeType = "3, 4.0" GeometryBasics = "0.5" LinearAlgebra = "1.0, 1.6" -Makie = "=0.22.0" +Makie = "=0.22.1" PrecompileTools = "1.0" julia = "1.3" diff --git a/GLMakie/Project.toml b/GLMakie/Project.toml index 143168a170f..78f767ee644 100644 --- a/GLMakie/Project.toml +++ b/GLMakie/Project.toml @@ -1,6 +1,6 @@ name = "GLMakie" uuid = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a" -version = "0.11.1" +version = "0.11.2" [deps] ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" @@ -30,7 +30,7 @@ FreeTypeAbstraction = "0.10" GLFW = "3.4.3" GeometryBasics = "0.5" LinearAlgebra = "1.0, 1.6" -Makie = "=0.22.0" +Makie = "=0.22.1" Markdown = "1.0, 1.6" MeshIO = "0.5" ModernGL = "1" diff --git a/Project.toml b/Project.toml index d6cefdde8c1..39fc4abdc40 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Makie" uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" authors = ["Simon Danisch", "Julius Krumbiegel"] -version = "0.22.0" +version = "0.22.1" [deps] Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340" diff --git a/RPRMakie/Project.toml b/RPRMakie/Project.toml index 7aae716c73c..6dc6cf6c965 100644 --- a/RPRMakie/Project.toml +++ b/RPRMakie/Project.toml @@ -1,7 +1,7 @@ name = "RPRMakie" uuid = "22d9f318-5e34-4b44-b769-6e3734a732a6" authors = ["Simon Danisch"] -version = "0.8.0" +version = "0.8.1" [deps] Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" @@ -17,7 +17,7 @@ Colors = "0.9, 0.10, 0.11, 0.12, 0.13" FileIO = "1.6" GeometryBasics = "0.5" LinearAlgebra = "1.0, 1.6" -Makie = "=0.22.0" +Makie = "=0.22.1" Printf = "1.0, 1.6" RadeonProRender = "0.3.2" julia = "1.3" diff --git a/WGLMakie/Project.toml b/WGLMakie/Project.toml index 3e5ca6dd007..78495dea03c 100644 --- a/WGLMakie/Project.toml +++ b/WGLMakie/Project.toml @@ -1,7 +1,7 @@ name = "WGLMakie" uuid = "276b4fcb-3e11-5398-bf8b-a0c2d153d008" authors = ["SimonDanisch "] -version = "0.11.0" +version = "0.11.1" [deps] Bonito = "824d6782-a2ef-11e9-3a09-e5662e0c26f8" @@ -27,7 +27,7 @@ FreeTypeAbstraction = "0.10" GeometryBasics = "0.5" Hyperscript = "0.0.3, 0.0.4, 0.0.5" LinearAlgebra = "1.0, 1.6" -Makie = "=0.22.0" +Makie = "=0.22.1" Observables = "0.5.1" PNGFiles = "0.3, 0.4" PrecompileTools = "1.0" From c6e137d72c389dd7f20b57d59ded40fb1df48f06 Mon Sep 17 00:00:00 2001 From: Frederic Freyer Date: Sat, 18 Jan 2025 22:26:55 +0100 Subject: [PATCH 2/2] Fix CI for ModernGL 1.1.8 (#4737) deal with ModernGL.enable_opengl_debugging becoming a ref --- GLMakie/test/runtests.jl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/GLMakie/test/runtests.jl b/GLMakie/test/runtests.jl index a0cc65517e7..b6c4be8d2d2 100644 --- a/GLMakie/test/runtests.jl +++ b/GLMakie/test/runtests.jl @@ -9,7 +9,10 @@ using ReferenceTests # verify OpenGL object cleanup GLMakie.GLAbstraction.GLMAKIE_DEBUG[] = true -if !GLMakie.ModernGL.enable_opengl_debugging +deref(x) = x +deref(x::Base.RefValue) = x[] + +if !deref(GLMakie.ModernGL.enable_opengl_debugging) # can't error, since we can't enable debugging for users @warn("TESTING WITHOUT OPENGL DEBUGGING") end