Hopefully make tests pass again

trixi-framework · Sep 11, 2021 · fb34793 · fb34793
1 parent 8830a1f
commit fb34793
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -4,11 +4,11 @@ authors = ["Michael Schlottke-Lakemper <michael@sloede.com>"]
 version = "0.1.1-pre"
 
 [deps]
-GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
 HOHQMesh_jll = "1d5cbd98-5122-5a8a-bea1-c186d986ee7f"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 
 [compat]
 HOHQMesh_jll = "1.0"
-GLMakie = "0.4.6"
+Requires = "1.1.3"
 julia = "1.6"
diff --git a/src/HOHQMesh.jl b/src/HOHQMesh.jl
@@ -1,10 +1,22 @@
 module HOHQMesh
 
-import HOHQMesh_jll
+# Include other packages that are used in HOHQMesh
+# (standard library packages first, other packages next, all of them sorted alphabetically)
+
+using HOHQMesh_jll: HOHQMesh_jll
+using Requires: @require
 
 export generate_mesh
 
 
+function __init__()
+  # Enable features that depend on the availability of the Makie package
+  @require Makie="ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" begin
+    using .Makie
+  end
+end
+
+
 """
     generate_mesh(control_file;
                   output_directory="out",

diff --git a/src/Viz/VizProject.jl b/src/Viz/VizProject.jl
@@ -24,8 +24,6 @@
  --- End License
 =#
 
-using GLMakie
-
 const MODEL = 1; const GRID = 2; const MESH = 4; const EMPTY = 0
 const REFINEMENTS = 8; const ALL = 15
 """