Skip to content

Commit

Permalink
0.6 (#15)
Browse files Browse the repository at this point in the history
Factorize out GridVisualizeTools, update Makie to 0.19, CairoMakie in CI+docs
  • Loading branch information
j-fu authored Dec 4, 2022
1 parent 8898d45 commit fcfed43
Show file tree
Hide file tree
Showing 12 changed files with 164 additions and 736 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
version:
- '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'.
- '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
# - 'nightly'
- 'nightly'
os:
- ubuntu-latest
- macos-latest
Expand Down
12 changes: 7 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "GridVisualize"
uuid = "5eed8a63-0fb0-45eb-886d-8d5a387d12b8"
authors = ["Juergen Fuhrmann <[email protected]>"]
version = "0.5.2"
version = "0.6"

[deps]
ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
Expand All @@ -10,6 +10,7 @@ DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
ElasticArrays = "fdbdab4c-e67f-52f5-8c3f-e7b388dad3d4"
ExtendableGrids = "cfc395e8-590f-11e8-1f13-43a2532b2fa8"
GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
GridVisualizeTools = "5573ae12-3b76-41d9-b48c-81d0b6e61cc5"
HypertextLiteral = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Observables = "510215fc-4207-5dde-b226-833fc4488ee2"
Expand All @@ -23,11 +24,12 @@ ColorSchemes = "3"
Colors = "0.12,1"
DocStringExtensions = "0.8,0.9"
ElasticArrays = "1"
ExtendableGrids = "0.7,0.8,0.9"
ExtendableGrids = "0.9"
GeometryBasics = "0.4.1"
GridVisualizeTools = "0.2"
HypertextLiteral = "0.9"
Observables = "0.4"
Observables = "0.5"
OrderedCollections = "1"
PkgVersion = "0.1"
PkgVersion = "0.1, 0.2, 0.3"
StaticArrays = "1"
julia = "1.3"
julia = "1.6"
2 changes: 1 addition & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[deps]
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
ExtendableGrids = "cfc395e8-590f-11e8-1f13-43a2532b2fa8"
Expand All @@ -7,4 +8,3 @@ Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Pluto = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
PlutoVista = "646e1f28-b900-46d7-9d87-d554eb38a413"
PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
5 changes: 2 additions & 3 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ENV["MPLBACKEND"]="agg"
using Documenter, ExtendableGrids, Literate, GridVisualize,Pluto
using GridVisualize.FlippableLayout
import PyPlot
import CairoMakie
using Test


Expand Down Expand Up @@ -32,7 +31,7 @@ function mkdocs()

if true
rendernotebook("plutovista")
makeplots(example_md_dir, Plotter=PyPlot)
makeplots(example_md_dir, Plotter=CairoMakie, extension="svg")
end
generated_examples=joinpath.("examples",filter(x->endswith(x, ".md"),readdir(example_md_dir)))
makedocs(sitename="GridVisualize.jl",
Expand Down
2 changes: 1 addition & 1 deletion docs/makeplots.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function makeplots(picdir; Plotter=PyPlot, extension="svg")
function makeplots(picdir; Plotter=GLMakie, extension="png")

p=plotting_multiscene(Plotter=Plotter)

Expand Down
2 changes: 1 addition & 1 deletion examples/plutovista.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### A Pluto.jl notebook ###
# v0.17.5
# v0.19.16

using Markdown
using InteractiveUtils
Expand Down
3 changes: 1 addition & 2 deletions src/GridVisualize.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ using ColorSchemes
using GeometryBasics
using PkgVersion

using GridVisualizeTools
using ExtendableGrids



include("dispatch.jl")
include("common.jl")
include("pyplot.jl")
Expand Down
Loading

2 comments on commit fcfed43

@j-fu
Copy link
Member Author

@j-fu j-fu commented on fcfed43 Dec 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/73461

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.6.0 -m "<description of version>" fcfed43691ae52801b075cb0a5f141a22d2e12c4
git push origin v0.6.0

Please sign in to comment.