Skip to content

Fix/breaking makie versions #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zetison merged 3 commits into from
Aug 7, 2025
Merged

Fix/breaking makie versions #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7c9500
Fix Makie versions to avoid breaking patches
Aug 7, 2025
71eecfb
Enable testing from outside the test folder
Aug 7, 2025
83304c7
Fix depricated function from Makie
Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "EnergyModelsGUI"
uuid = "737a7361-d3b7-40e9-b1ac-59bee4c5ea2d"
authors = ["Jon Vegard Venås <JonVegard.Venas@sintef.no>", "Magnus Askeland <Magnus.Askeland@sintef.no>", "Shweta Tiwari <Shweta.Tiwari@sintef.no>"]
version = "0.5.14"
version = "0.5.15"

[deps]
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/utils_GUI/topo_axis_utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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([
Expand Down
2 changes: 1 addition & 1 deletion test/JuliaFormatter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ using JuliaFormatter

@testset "JuliaFormatter.jl" begin
@test begin
format("..")
format(joinpath(@__DIR__, ".."))
end
end
Loading