Skip to content

Commit df82dfe

Browse files
author
Jon Vegard Venås
authored
Fix/breaking makie versions (#25)
* Fix Makie versions to avoid breaking patches * Enable testing from outside the test folder * Fix depricated function from Makie
1 parent bec2ccf commit df82dfe

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*.geojson
1818
*startup.jl
1919
/test/test_coverage.jl
20-
/dev
2120

2221
# Build artifacts for creating documentation generated by the Documenter package
2322
/examples/exported_files

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "EnergyModelsGUI"
22
uuid = "737a7361-d3b7-40e9-b1ac-59bee4c5ea2d"
33
authors = ["Jon Vegard Venås <JonVegard.Venas@sintef.no>", "Magnus Askeland <Magnus.Askeland@sintef.no>", "Shweta Tiwari <Shweta.Tiwari@sintef.no>"]
4-
version = "0.5.14"
4+
version = "0.5.15"
55

66
[deps]
77
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
@@ -31,14 +31,14 @@ EnergyModelsGeography = "3f775d88-a4da-46c4-a2cc-aa9f16db6708"
3131
EMGExt = "EnergyModelsGeography"
3232

3333
[compat]
34-
CairoMakie = "0.12"
34+
CairoMakie = "=0.12.18"
3535
Colors = "0.12"
3636
Dates = "1.9"
3737
EnergyModelsBase = "0.9"
3838
EnergyModelsGeography = "0.11"
3939
EnergyModelsInvestments = "0.8"
4040
FileIO = "1.16"
41-
GLMakie = "0.10.5"
41+
GLMakie = "=0.10.18"
4242
GeoJSON = "0.8"
4343
GeoMakie = "=0.7.12"
4444
HTTP = "1.10"

src/utils_GUI/topo_axis_utils.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function pixel_to_data(gui::GUI, pixel_size::Real)
1010
y_range::Float64 = vars[:ylimits][2] - vars[:ylimits][1]
1111

1212
# Get the widths of the axis
13-
plot_widths::Vec2{Int64} = pixelarea(get_ax(gui, :topo).scene)[].widths
13+
plot_widths::Vec2{Int64} = viewport(get_ax(gui, :topo).scene)[].widths
1414

1515
# Calculate the conversion factor
1616
x_factor::Float64 = x_range / plot_widths[1]
@@ -55,7 +55,7 @@ function new_global_delta_h(gui::GUI)
5555
vars = get_vars(gui)
5656
axes = get_axes(gui)
5757
xyWidths::Vec = axes[:topo].finallimits[].widths
58-
plot_widths::Vec2{Int64} = pixelarea(axes[:topo].scene)[].widths
58+
plot_widths::Vec2{Int64} = viewport(axes[:topo].scene)[].widths
5959
vars[:Δh] = maximum([
6060
maximum(Vector(0.5 * vars[:Δh_px] * xyWidths ./ plot_widths)),
6161
minimum([

test/JuliaFormatter.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ using JuliaFormatter
22

33
@testset "JuliaFormatter.jl" begin
44
@test begin
5-
format("..")
5+
format(joinpath(@__DIR__, ".."))
66
end
77
end

0 commit comments

Comments
 (0)