Modernize (#18)

Modernize code: * Allow for Makie plots * @deprecate triunsuitable triunsuitable! * Remove PyPlot dependency for docs * JuliaFormatter
JuliaGeometry · Nov 13, 2023 · 34002ed · 34002ed · j-fu · Nov 13, 2023
1 parent 1705eb6
commit 34002ed
Show file tree

Hide file tree

Showing 22 changed files with 2,622 additions and 999 deletions.
diff --git a/.JuliaFormatter.toml b/.JuliaFormatter.toml
@@ -1,4 +1,7 @@
 style = "sciml"
+pipe_to_function_call=false
 always_for_in = false
 separate_kwargs_with_semicolon = true
 margin = 132
+yas_style_nesting=true
+ignore = "examples/pluto-examples.jl"
diff --git a/Project.toml b/Project.toml
@@ -1,16 +1,28 @@
 name = "Triangulate"
 uuid = "f7e6ffb2-c36d-4f8f-a77e-16e897189344"
 authors = ["Juergen Fuhrmann <[email protected]>"]
-version = "2.2.0"
+version = "2.3.0"
 
 [deps]
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
-Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Triangle_jll = "5639c1d2-226c-5e70-8d55-b3095415a16a"
 
+[weakdeps]
+CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
+GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
+PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
+
 [compat]
+CairoMakie = "0.10"
 DocStringExtensions = "0.8, 0.9"
-julia = "1.3"
+GLMakie = "0.8"
+Printf = "1.6"
+PyPlot = "2"
 Triangle_jll = "1.6.2"
+julia = "1.6"
+
+[extras]
+CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
+GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
+PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
diff --git a/docs/make.jl b/docs/make.jl
@@ -1,37 +1,34 @@
 using Documenter, Triangulate, Literate, Pluto
 
 function rendernotebook(name)
-    input=joinpath(@__DIR__,"..","examples",name*".jl")
-    output=joinpath(@__DIR__,"src",name*".html")
-    session = Pluto.ServerSession();
-    notebook = Pluto.SessionActions.open(session, input; run_async=false)
+    input = joinpath(@__DIR__, "..", "examples", name * ".jl")
+    output = joinpath(@__DIR__, "src", name * ".html")
+    session = Pluto.ServerSession()
+    ENV["PLUTO_PROJECT"] = joinpath(@__DIR__, "..", "examples")
+    notebook = Pluto.SessionActions.open(session, input; run_async = false)
     html_contents = Pluto.generate_html(notebook)
     write(output, html_contents)
 end
 
-
-
 function make_all()
     rendernotebook("pluto-examples")
-
-    makedocs(
-        sitename="Triangulate.jl",
-        modules = [Triangulate],
-        clean = false,
-        doctest = false,
-        authors = "Juergen Fuhrmann, Francesco Furiani, Konrad Simon",
-        repo="https://github.com/JuliaGeometry/Triangulate.jl",
-        pages=[ 
-            "Home"=>"index.md",
-            "triangle-h.md",
-            "changes.md",
-            "allindex.md",
-            "examples.md"
-        ]
-    )
-
+
+    makedocs(; sitename = "Triangulate.jl",
+             modules = [Triangulate],
+             clean = false,
+             doctest = false,
+             authors = "Juergen Fuhrmann, Francesco Furiani, Konrad Simon",
+             repo = "https://github.com/JuliaGeometry/Triangulate.jl",
+             pages = [
+                 "Home" => "index.md",
+                 "triangle-h.md",
+                 "changes.md",
+                 "allindex.md",
+                 "examples.md",
+             ])
+
     if !isinteractive()
-        deploydocs(repo = "github.com/JuliaGeometry/Triangulate.jl.git")
+        deploydocs(; repo = "github.com/JuliaGeometry/Triangulate.jl.git")
     end
 end
 

diff --git a/examples/Project.toml b/examples/Project.toml
@@ -0,0 +1,6 @@
+[deps]
+CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
+PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
+Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
+Triangulate = "f7e6ffb2-c36d-4f8f-a77e-16e897189344"