Merge branch 'master' into sd/improve-colorbar-error

MakieOrg · Sep 12, 2023 · 79f2b71 · 79f2b71
2 parents ff7acf5 + eda228a
commit 79f2b71
Show file tree

Hide file tree

Showing 22 changed files with 54 additions and 75 deletions.
diff --git a/.github/workflows/Docs.yml b/.github/workflows/Docs.yml
@@ -1,16 +1,14 @@
 name: Docs build and deploy
 on:
-  push:
+  pull_request:
     branches:
-      - main
       - master
-      - breaking-release
-    tags: '*'
-  pull_request:
+      - sd/beta-20
+  push:
+    tags:
+      - '*'
     branches:
-      - main
       - master
-      - breaking-release
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

diff --git a/.github/workflows/cairomakie.yaml b/.github/workflows/cairomakie.yaml
@@ -6,15 +6,10 @@ on:
       - '*.md'
     branches:
       - master
-      - breaking-release
+      - sd/beta-20
   push:
-    paths-ignore:
-      - 'docs/**'
-      - '*.md'
-    branches:
-      - master
-      - breaking-release
-    tags: '*'
+    tags:
+      - '*'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,15 +6,12 @@ on:
       - '*.md'
     branches:
       - master
-      - breaking-release
+      - sd/beta-20
   push:
-    paths-ignore:
-      - 'docs/**'
-      - '*.md'
+    tags:
+      - '*'
     branches:
       - master
-      - breaking-release
-    tags: '*'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

diff --git a/.github/workflows/compilation-benchmark.yaml b/.github/workflows/compilation-benchmark.yaml
@@ -6,7 +6,7 @@ on:
       - '*.md'
     branches:
       - master
-      - breaking-release
+      - sd/beta-20
 jobs:
   benchmark:
     name: ${{ matrix.package }}

diff --git a/.github/workflows/glmakie.yaml b/.github/workflows/glmakie.yaml
@@ -6,15 +6,12 @@ on:
       - '*.md'
     branches:
       - master
-      - breaking-release
+      - sd/beta-20
   push:
-    paths-ignore:
-      - 'docs/**'
-      - '*.md'
+    tags:
+      - '*'
     branches:
       - master
-      - breaking-release
-    tags: '*'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -44,7 +41,7 @@ jobs:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
       - uses: julia-actions/cache@v1
-      - run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
+      - run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev xsettingsd x11-xserver-utils
       - name: Install Julia dependencies
         shell: julia --project=monorepo {0}
         run: |

diff --git a/.github/workflows/rprmakie.yaml b/.github/workflows/rprmakie.yaml
@@ -6,15 +6,12 @@ on:
       - '*.md'
     branches:
       - master
-      - breaking-release
+      - sd/beta-20
   push:
-    paths-ignore:
-      - 'docs/**'
-      - '*.md'
+    tags:
+      - '*'
     branches:
       - master
-      - breaking-release
-    tags: '*'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

diff --git a/.github/workflows/wglmakie.yaml b/.github/workflows/wglmakie.yaml
@@ -6,16 +6,12 @@ on:
       - '*.md'
     branches:
       - master
-      - breaking-release
+      - sd/beta-20
   push:
-    paths-ignore:
-      - 'docs/**'
-      - '*.md'
+    tags:
+      - '*'
     branches:
       - master
-      - breaking-release
-    tags: '*'
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true

diff --git a/CairoMakie/Project.toml b/CairoMakie/Project.toml
@@ -1,7 +1,7 @@
 name = "CairoMakie"
 uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 author = ["Simon Danisch <sdanisch@gmail.com>"]
-version = "0.10.8"
+version = "0.10.9"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -23,7 +23,7 @@ FFTW = "1"
 FileIO = "1.1"
 FreeType = "3, 4.0"
 GeometryBasics = "0.4.1"
-Makie = "=0.19.8"
+Makie = "=0.19.9"
 PrecompileTools = "1.0"
 julia = "1.3"
 

diff --git a/CairoMakie/test/Project.toml b/CairoMakie/test/Project.toml
@@ -0,0 +1,4 @@
+[deps]
+Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
+ReferenceTests = "d37af2e0-5618-4e00-9939-d430db56ee94"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
diff --git a/CairoMakie/test/runtests.jl b/CairoMakie/test/runtests.jl
@@ -1,10 +1,8 @@
 using Test
 using CairoMakie
-using Pkg
 using Makie.FileIO
+using ReferenceTests
 
-path = normpath(joinpath(dirname(pathof(Makie)), "..", "ReferenceTests"))
-Pkg.develop(PackageSpec(path = path))
 # Before changing Pkg environment, try the test in #864
 @testset "Runs without error" begin
     fig = Figure()

diff --git a/GLMakie/Project.toml b/GLMakie/Project.toml
@@ -1,6 +1,6 @@
 name = "GLMakie"
 uuid = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
-version = "0.8.8"
+version = "0.8.9"
 
 [deps]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
@@ -29,7 +29,7 @@ FixedPointNumbers = "0.7, 0.8"
 FreeTypeAbstraction = "0.10"
 GLFW = "3"
 GeometryBasics = "0.4.1"
-Makie = "=0.19.8"
+Makie = "=0.19.9"
 MeshIO = "0.4"
 ModernGL = "1"
 Observables = "0.5.1"

diff --git a/GLMakie/test/Project.toml b/GLMakie/test/Project.toml
@@ -1,8 +1,10 @@
 [deps]
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
+GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
 GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
 ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+ReferenceTests = "d37af2e0-5618-4e00-9939-d430db56ee94"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
diff --git a/GLMakie/test/runtests.jl b/GLMakie/test/runtests.jl
@@ -1,20 +1,16 @@
+using Makie
 using GLMakie, Test
 using FileIO
 using GeometryBasics
 using GeometryBasics: origin
-using Makie
-using ImageMagick
-using Pkg
 using Random
+using ReferenceTests
 
 if !GLMakie.ModernGL.enable_opengl_debugging
     # can't error, since we can't enable debugging for users
     @warn("TESTING WITHOUT OPENGL DEBUGGING")
 end
 
-reference_tests_dir = normpath(joinpath(dirname(pathof(Makie)), "..", "ReferenceTests"))
-Pkg.develop(PackageSpec(path = reference_tests_dir))
-using ReferenceTests
 
 GLMakie.activate!(framerate=1.0)
 

diff --git a/MakieCore/Project.toml b/MakieCore/Project.toml
@@ -1,7 +1,7 @@
 authors = ["Simon Danisch"]
 name = "MakieCore"
 uuid = "20f20a25-4f0e-4fdf-b5d1-57303727442b"
-version = "0.6.5"
+version = "0.6.6"
 
 [deps]
 Observables = "510215fc-4207-5dde-b226-833fc4488ee2"

diff --git a/NEWS.md b/NEWS.md
@@ -1,8 +1,10 @@
 # News
 
 ## master
-- Allow arbitrary reversible scale functions through `ReversibleScale`.
 
+## v0.19.9
+
+- Allow arbitrary reversible scale functions through `ReversibleScale`.
 - Deprecated `linestyle=vector_of_gaps` in favor of `linestyle=Linestyle(vector_of_gaps)` [3135](https://github.com/MakieOrg/Makie.jl/pull/3135), [3193](https://github.com/MakieOrg/Makie.jl/pull/3193).
 - Fixed some errors around dynamic changes of `ax.xscale` or `ax.yscale` [#3084](https://github.com/MakieOrg/Makie.jl/pull/3084)
 - Improved Barplot Label Alignment [#3160](https://github.com/MakieOrg/Makie.jl/issues/3160).

diff --git 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.19.8"
+version = "0.19.9"
 
 [deps]
 Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340"
@@ -82,7 +82,7 @@ Isoband = "0.1"
 KernelDensity = "0.5, 0.6"
 LaTeXStrings = "1.2"
 MacroTools = "0.5"
-MakieCore = "=0.6.5"
+MakieCore = "=0.6.6"
 Match = "1.1"
 MathTeXEngine = "0.5"
 Observables = "0.5.3"

diff --git 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.5.8"
+version = "0.5.9"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -17,7 +17,7 @@ julia = "1.3"
 Colors = "0.9, 0.10, 0.11, 0.12"
 FileIO = "1.6"
 GeometryBasics = "0.4.1"
-Makie = "=0.19.8"
+Makie = "=0.19.9"
 RadeonProRender = "0.3.0"
 
 [extras]

diff --git a/WGLMakie/Project.toml b/WGLMakie/Project.toml
@@ -1,7 +1,7 @@
 name = "WGLMakie"
 uuid = "276b4fcb-3e11-5398-bf8b-a0c2d153d008"
 authors = ["SimonDanisch <sdanisch@gmail.com>"]
-version = "0.8.12"
+version = "0.8.13"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -26,7 +26,7 @@ FreeTypeAbstraction = "0.10"
 GeometryBasics = "0.4.1"
 Hyperscript = "0.0.3, 0.0.4"
 JSServe = "2.2"
-Makie = "=0.19.8"
+Makie = "=0.19.9"
 Observables = "0.5.1"
 RelocatableFolders = "0.1, 0.2, 0.3, 1.0"
 ShaderAbstractions = "0.3"

diff --git a/WGLMakie/test/Project.toml b/WGLMakie/test/Project.toml
@@ -4,7 +4,5 @@ FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
 JSServe = "824d6782-a2ef-11e9-3a09-e5662e0c26f9"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+ReferenceTests = "d37af2e0-5618-4e00-9939-d430db56ee94"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-
-[compat]
-Electron = "4.1.1"
diff --git a/WGLMakie/test/runtests.jl b/WGLMakie/test/runtests.jl
@@ -1,11 +1,7 @@
 using FileIO
 using WGLMakie, Makie, Test
-using Pkg
 using WGLMakie.JSServe
 import Electron
-
-path = normpath(joinpath(dirname(pathof(Makie)), "..", "ReferenceTests"))
-Pkg.develop(PackageSpec(path = path))
 using ReferenceTests
 
 @testset "mimes" begin

diff --git a/src/basic_recipes/text.jl b/src/basic_recipes/text.jl
@@ -161,8 +161,13 @@ function plot!(plot::Text{<:Tuple{<:AbstractArray{<:Tuple{<:Any, <:Point}}}})
         strs = first.(str_pos)
         poss = to_ndim.(Ref(Point3f), last.(str_pos), 0)
 
-        strings.val != strs && (strings[] = strs)
-        positions.val != poss && (positions[] = poss)
+        strings_unequal = strings.val != strs
+        pos_unequal = positions.val != poss
+        strings_unequal && (strings.val = strs)
+        pos_unequal && (positions.val = poss)
+        # Check for equality very imortant, otherwise we get an infinite loop
+        strings_unequal && notify(strings)
+        pos_unequal && notify(positions)
 
         return
     end

diff --git a/src/makielayout/lineaxis.jl b/src/makielayout/lineaxis.jl
@@ -234,9 +234,6 @@ function update_minor_ticks(minortickpositions, limits::NTuple{2, Float32}, pos_
     px_o = extents[1]
     px_width = extents[2] - extents[1]
 
-    lim_o = limits[1]
-    lim_w = limits[2] - limits[1]
-
     tickvalues_scaled = scale.(minortickvalues)
 
     tick_fractions = (tickvalues_scaled .- scale(limits[1])) ./ (scale(limits[2]) - scale(limits[1]))
@@ -494,6 +491,7 @@ function LineAxis(parent::Scene, attrs::Attributes)
     # before other stuff is triggered by them, which accesses the
     # ticklabel boundingbox (which needs to be updated already)
     # so we move the new listener from text! to the front
+
     pushfirst!(ticklabel_annotation_obs.listeners, pop!(ticklabel_annotation_obs.listeners))
 
     # trigger calculation of ticklabel width once, now that it's not nothing anymore