Skip to content

Commit 9fa2d0c

Browse files
committed
bump version to 1.6
* require Julia >= 1.9 * allow for Makie 0.21; See also https://blog.makie.org/blogposts/v0.21/
1 parent b6a1603 commit 9fa2d0c

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
version:
18-
- '1.6' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
18+
- '1.9' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
1919
- '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
2020
- 'nightly'
2121
os:

Project.toml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "GridVisualize"
22
uuid = "5eed8a63-0fb0-45eb-886d-8d5a387d12b8"
33
authors = ["Juergen Fuhrmann <[email protected]>"]
4-
version = "1.5.1"
4+
version = "1.6"
55

66
[deps]
77
ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
@@ -21,13 +21,13 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
2121
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
2222

2323
[compat]
24-
CairoMakie = "0.11.3"
24+
CairoMakie = "0.11.3, 0.12"
2525
ColorSchemes = "3"
2626
Colors = "0.12,1"
2727
DocStringExtensions = "0.8,0.9"
2828
ElasticArrays = "1"
2929
ExtendableGrids = "0.9,1"
30-
GLMakie = "0.9"
30+
GLMakie = "0.9, 0.10"
3131
GeometryBasics = "0.4.1"
3232
GridVisualizeTools = "1.1"
3333
HypertextLiteral = "0.9"
@@ -41,14 +41,8 @@ PlutoVista = "0.8.24,1"
4141
Printf = "1.6"
4242
PyPlot = "2"
4343
StaticArrays = "1"
44-
julia = "1.6"
44+
julia = "1.9"
4545

46-
[extras]
47-
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
48-
GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
49-
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
50-
PlutoVista = "646e1f28-b900-46d7-9d87-d554eb38a413"
51-
PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
5246

5347
[weakdeps]
5448
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"

src/makie.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ function scalarplot!(ctx, TP::Type{MakieType}, ::Type{Val{1}}, grids, parentgrid
396396
map(a -> a[1:ctx[:markevery]:end], ctx[:lines][l]);
397397
color = RGB(ctx[:color]),
398398
marker = ctx[:markershape],
399-
markercolor = RGB(ctx[:color]),
400399
markersize = ctx[:markersize],)
401400
end
402401

@@ -977,8 +976,6 @@ function gridplot!(ctx, TP::Type{MakieType}, ::Type{Val{3}}, grid)
977976
XMakie.wireframe!(ctx[:scene],
978977
map(d -> d[i], ctx[:cellmeshes]);
979978
color = :black,
980-
strokecolor = :black,
981-
strokewidth = ctx[:linewidth],
982979
linewidth = ctx[:linewidth],)
983980
end
984981
end
@@ -1004,7 +1001,6 @@ function gridplot!(ctx, TP::Type{MakieType}, ::Type{Val{3}}, grid)
10041001
XMakie.wireframe!(ctx[:scene],
10051002
map(d -> d[i], ctx[:facemeshes]);
10061003
color = :black,
1007-
strokecolor = :black,
10081004
linewidth = ctx[:linewidth],)
10091005
end
10101006
end

0 commit comments

Comments
 (0)