CompatHelper: bump compat for QuantumOpticsBase to 0.5, (keep existin…

…g compat) (#126) * CompatHelper: bump compat for QuantumOpticsBase to 0.5, (keep existing compat) * fixes for new version of makie (incorrect markerspace keyword argument) * fix for GLFW library issues --------- Co-authored-by: CompatHelper Julia <[email protected]> Co-authored-by: Stefan Krastanov <[email protected]>
QuantumSavory · Jul 2, 2024 · aa11bf4 · aa11bf4
1 parent e2424b4
commit aa11bf4
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## v0.4.2 - dev
 
-- Bump QuantumSymbolics compat bound and bump julia compat to 1.10.
+- Bump QuantumSymbolics and QuantumOpticsBase compat bound and bump julia compat to 1.10.
 
 ## v0.4.1 - 2024-06-05
 

diff --git a/Project.toml b/Project.toml
@@ -52,7 +52,7 @@ Printf = "1"
 QuantumClifford = "0.8.20, 0.9"
 QuantumInterface = "0.3.4"
 QuantumOptics = "1.0.5"
-QuantumOpticsBase = "0.4.22"
+QuantumOpticsBase = "0.4.22, 0.5"
 QuantumSymbolics = "0.3"
 Random = "1"
 Reexport = "1.2.2"

diff --git a/examples/colorcentermodularcluster/2_real_time_visualization.jl b/examples/colorcentermodularcluster/2_real_time_visualization.jl
@@ -34,7 +34,7 @@ for (i,v) in enumerate(vertices(net))
         color=lift(x->fill(x[v],length(neighbors(net,v))),linkcolors),
         colormap = :Spectral,
         colorrange = (-1., 1.),
-        linewidth=3,markerspace=:data)
+        linewidth=3)
     v==1 && Colorbar(subfig_rg[2,1],ls,vertical=false,flipaxis=false,label="Entanglement Stabilizer Expectation")
 end
 

diff --git a/examples/colorcentermodularcluster/3_makie_interactive.jl b/examples/colorcentermodularcluster/3_makie_interactive.jl
@@ -261,7 +261,7 @@ singletraj = App() do
             color=lift(x->fill(x[v],length(neighbors(net,v))),linkcolors),
             colormap = :Spectral,
             colorrange = (-1., 1.),
-            linewidth=3,markerspace=:data)
+            linewidth=3)
         v==1 && Colorbar(subfig_rg[2,1],ls,vertical=false,flipaxis=false,label="Entanglement Stabilizer Expectation")
     end
 

diff --git a/ext/QuantumSavoryMakie/QuantumSavoryMakie.jl b/ext/QuantumSavoryMakie/QuantumSavoryMakie.jl
@@ -201,7 +201,7 @@ function Makie.plot!(rn::RegisterNetPlot{<:Tuple{RegisterNet}})
         inspector_label = (self, i, p) -> get_observables_vis_string(observables_backref[],i))
     observables_linesegments = linesegments!(
         rn, observables_links,
-        linewidth=rn[:observables_linewidth], markerspace=:data,
+        linewidth=rn[:observables_linewidth],
         color=observables_linkvals, colormap=rn[:colormap], colorrange=rn[:colorrange],
         inspector_label = (self, i, p) -> get_observables_vis_string(observables_links_backref[],i))
     state_scatterplot = scatter!(

diff --git a/test/Project.toml b/test/Project.toml
@@ -7,7 +7,6 @@ DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
-GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
@@ -16,6 +15,7 @@ JumpProcesses = "ccbc3e58-028d-4f4c-8cd5-9ae44345cda5"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Quantikz = "b0d11df0-eea3-4d79-b4a5-421488cbf74b"
 QuantumClifford = "0525e862-1e90-11e9-3e4d-1b39d7109de1"
 QuantumOptics = "6e0679c1-51ea-5a7c-ac74-d61b76210b0c"

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -45,6 +45,10 @@ println("Starting tests with $(Threads.nthreads()) threads out of `Sys.CPU_THREA
 
 @doset "stateszoo_api"
 
+if get(ENV,"QUANTUMSAVORY_PLOT_TEST","")=="true"
+    using Pkg
+    Pkg.add("GLMakie")
+end
 @doset "examples"
 get(ENV,"QUANTUMSAVORY_PLOT_TEST","")=="true" && @doset "plotting_cairo"
 get(ENV,"QUANTUMSAVORY_PLOT_TEST","")=="true" && @doset "plotting_gl"

diff --git a/test/test_examples.jl b/test/test_examples.jl
@@ -35,3 +35,8 @@ end
         include("../examples/simpleswitch/1_interactive_visualization.jl")
     end
 end
+
+if get(ENV,"QUANTUMSAVORY_PLOT_TEST","")=="true"
+    import GLMakie
+    GLMakie.closeall() # to avoid errors when running headless
+end