diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f5f9c77..cb5f5db9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 with: - version: '1.9' + version: '1.10' - run: | julia --project=docs -e ' using Pkg diff --git a/Project.toml b/Project.toml index 03fb9030..63d3b10b 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "MeshArrays" uuid = "cb8c808f-1acf-59a3-9d2b-6e38d009f683" authors = ["gaelforget "] -version = "0.3.2" +version = "0.3.3" [deps] CatViews = "81a5f4ea-a946-549a-aa7e-2a7f63a27d31" @@ -35,7 +35,7 @@ MeshArraysZipFileExt = ["ZipFile"] [compat] CatViews = "1.0" Downloads = "1" -GeoJSON = "0.6, 0.7" +GeoJSON = "0.6, 0.7, 0.8" JLD2 = "0.4" Makie = "0.19, 0.20" NearestNeighbors = "0.4" diff --git a/docs/make.jl b/docs/make.jl index 473c95ad..25c69fdf 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -12,7 +12,7 @@ fil=demo.download_polygons("ne_110m_admin_0_countries.shp") MeshArrays.interpolation_setup() -makedocs( +makedocs(; sitename = "MeshArrays", format = Documenter.HTML(), modules = [MeshArrays], @@ -25,7 +25,8 @@ makedocs( "Video Examples" => "videos.md", "API documentation" => "API.md", "Miscellaneous" => "detail.md", - ] + ], + authors="gaelforget ", ) lst=("basics.jl","geography.jl","vectors.jl") diff --git a/src/MeshArrays.jl b/src/MeshArrays.jl index 6dc7ce5f..0ad80a1e 100644 --- a/src/MeshArrays.jl +++ b/src/MeshArrays.jl @@ -30,6 +30,7 @@ include("Solvers.jl") include("ReIndexing.jl") include("Interpolation.jl") include("VerticalDimension.jl") +include("demo.jl") export AbstractMeshArray, MeshArray, gcmgrid, varmeta export GridSpec, GridLoad, GridLoadVar, UnitGrid, simple_periodic_domain @@ -64,6 +65,4 @@ function download_file end function plot_examples end; export plot_examples examples_plot=plot_examples -include("demo.jl") - end # module diff --git a/src/demo.jl b/src/demo.jl index e7798306..fa9120ea 100644 --- a/src/demo.jl +++ b/src/demo.jl @@ -1,10 +1,10 @@ module demo + import MeshArrays import MeshArrays: read_JLD2, write_JLD2, Transect, rotate_points, rotate_XCYC import MeshArrays: edge_mask, MskToTab, shorter_paths! import MeshArrays: GRID_LLC90, GridSpec, MeshArray - import MeshArrays: download_file, unzip """ ocean_sections() @@ -148,9 +148,9 @@ module demo fil="unknown" url="unknown" end - !isfile(fil) ? download_file(url,fil) : nothing + !isfile(fil) ? MeshArrays.download_file(url,fil) : nothing if !isempty(unzipfil) - unzip(fil) + MeshArrays.unzip(fil) fil=unzipfil end fil