Merge pull request #119 from gaelforget/V0p3p3a

updates
JuliaClimate · Apr 8, 2024 · d774ca5 · d774ca5
2 parents a73b283 + 8c58796
commit d774ca5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -1,7 +1,7 @@
 name = "MeshArrays"
 uuid = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
 authors = ["gaelforget <gforget@mit.edu>"]
-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
@@ -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 <gforget@mit.edu>",
 )
 
 lst=("basics.jl","geography.jl","vectors.jl")

diff --git 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
@@ -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