From e7c9500ebca5ee7e13855c09e36cdf52724b689e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Vegard=20Ven=C3=A5s?= Date: Thu, 7 Aug 2025 09:50:26 +0200 Subject: [PATCH 1/3] Fix Makie versions to avoid breaking patches --- Project.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index f3fa91c..7d3c823 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "EnergyModelsGUI" uuid = "737a7361-d3b7-40e9-b1ac-59bee4c5ea2d" authors = ["Jon Vegard Venås ", "Magnus Askeland ", "Shweta Tiwari "] -version = "0.5.14" +version = "0.5.15" [deps] CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" @@ -31,14 +31,14 @@ EnergyModelsGeography = "3f775d88-a4da-46c4-a2cc-aa9f16db6708" EMGExt = "EnergyModelsGeography" [compat] -CairoMakie = "0.12" +CairoMakie = "=0.12.18" Colors = "0.12" Dates = "1.9" EnergyModelsBase = "0.9" EnergyModelsGeography = "0.11" EnergyModelsInvestments = "0.8" FileIO = "1.16" -GLMakie = "0.10.5" +GLMakie = "=0.10.18" GeoJSON = "0.8" GeoMakie = "=0.7.12" HTTP = "1.10" From 71eecfb694bcd41fbf13c01adbb198821a2bb9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Vegard=20Ven=C3=A5s?= Date: Thu, 7 Aug 2025 09:51:29 +0200 Subject: [PATCH 2/3] Enable testing from outside the test folder --- .gitignore | 1 - test/JuliaFormatter.jl | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1686045..fbac85e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,6 @@ *.geojson *startup.jl /test/test_coverage.jl -/dev # Build artifacts for creating documentation generated by the Documenter package /examples/exported_files diff --git a/test/JuliaFormatter.jl b/test/JuliaFormatter.jl index b69b613..ee6cac4 100644 --- a/test/JuliaFormatter.jl +++ b/test/JuliaFormatter.jl @@ -2,6 +2,6 @@ using JuliaFormatter @testset "JuliaFormatter.jl" begin @test begin - format("..") + format(joinpath(@__DIR__, "..")) end end From 83304c71dca6940ae91d884d48abeff6c6ad3e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Vegard=20Ven=C3=A5s?= Date: Thu, 7 Aug 2025 09:51:57 +0200 Subject: [PATCH 3/3] Fix depricated function from Makie --- src/utils_GUI/topo_axis_utils.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils_GUI/topo_axis_utils.jl b/src/utils_GUI/topo_axis_utils.jl index 4b64ce2..279c4e4 100644 --- a/src/utils_GUI/topo_axis_utils.jl +++ b/src/utils_GUI/topo_axis_utils.jl @@ -10,7 +10,7 @@ function pixel_to_data(gui::GUI, pixel_size::Real) y_range::Float64 = vars[:ylimits][2] - vars[:ylimits][1] # Get the widths of the axis - plot_widths::Vec2{Int64} = pixelarea(get_ax(gui, :topo).scene)[].widths + plot_widths::Vec2{Int64} = viewport(get_ax(gui, :topo).scene)[].widths # Calculate the conversion factor x_factor::Float64 = x_range / plot_widths[1] @@ -55,7 +55,7 @@ function new_global_delta_h(gui::GUI) vars = get_vars(gui) axes = get_axes(gui) xyWidths::Vec = axes[:topo].finallimits[].widths - plot_widths::Vec2{Int64} = pixelarea(axes[:topo].scene)[].widths + plot_widths::Vec2{Int64} = viewport(axes[:topo].scene)[].widths vars[:Δh] = maximum([ maximum(Vector(0.5 * vars[:Δh_px] * xyWidths ./ plot_widths)), minimum([