From 5c7d118a36b369d1790cfd55d277db4d9d20cf52 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 14:41:31 +0100 Subject: [PATCH] CompatHelper: bump compat for Turing to 0.20, (keep existing compat) (#45) * CompatHelper: bump compat for Turing to 0.20, (keep existing compat) * Solved most issues Co-authored-by: CompatHelper Julia Co-authored-by: Theo Galy-Fajou --- .github/workflows/CompatHelper.yml | 2 +- Project.toml | 8 ++++---- src/Turkie.jl | 2 +- src/live_sampling/online_stats_plots.jl | 2 +- src/live_sampling/turkie_callback.jl | 4 ++-- test/Project.toml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml index 2f021ad..d7896a8 100644 --- a/.github/workflows/CompatHelper.yml +++ b/.github/workflows/CompatHelper.yml @@ -13,4 +13,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }} - run: julia -e 'using CompatHelper; CompatHelper.main(; bump_version=true)' + run: julia -e 'using CompatHelper; CompatHelper.main(; bump_version=true, subdirs=["test", "docs"])' diff --git a/Project.toml b/Project.toml index ceeaba6..3a19244 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Turkie" uuid = "8156cc02-0533-41cd-9345-13411ebe105f" authors = ["Theo Galy-Fajou and contributors"] -version = "0.1.10" +version = "0.1.11" [deps] ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4" @@ -17,7 +17,7 @@ ColorSchemes = "3" Colors = "0.12" KernelDensity = "0.6" MCMCChains = "4, 5" -Makie = "0.15" +Makie = "0.15, 0.16" OnlineStats = "1.5" -Turing = "0.15, 0.16, 0.17, 0.18, 0.19" -julia = "1.6" \ No newline at end of file +Turing = "0.20" +julia = "1.6" diff --git a/src/Turkie.jl b/src/Turkie.jl index b2e917a..b0449a3 100644 --- a/src/Turkie.jl +++ b/src/Turkie.jl @@ -2,7 +2,7 @@ module Turkie using Makie: Makie, Figure, Axis, Point2f0 using Makie: barplot!, lines!, scatter! # Plotting tools -using Makie: Observable, Node, lift, on # Observable tools +using Makie: Observable, lift, on # Observable tools using Makie: recordframe! # Recording tools using Makie.MakieLayout # Layouting tool using Colors, ColorSchemes # Colors tools diff --git a/src/live_sampling/online_stats_plots.jl b/src/live_sampling/online_stats_plots.jl index ea409a9..d3d0f11 100644 --- a/src/live_sampling/online_stats_plots.jl +++ b/src/live_sampling/online_stats_plots.jl @@ -72,7 +72,7 @@ function onlineplot!(axis, stat::KHist, stats, iter, data, iterations, i, j) on(iter) do _ stat[] = fit!(stat[], last(value(data[]))) end - hist_vals = Node(Point2f0.(collect(range(0f0, 1f0, length=nbins)), zeros(Float32, nbins))) + hist_vals = Observable(Point2f0.(collect(range(0f0, 1f0, length=nbins)), zeros(Float32, nbins))) push!(stats, stat) on(stat) do h edges, weights = OnlineStats.xy(h) diff --git a/src/live_sampling/turkie_callback.jl b/src/live_sampling/turkie_callback.jl index af9d61f..e87adff 100644 --- a/src/live_sampling/turkie_callback.jl +++ b/src/live_sampling/turkie_callback.jl @@ -55,12 +55,12 @@ function TurkieCallback(vars::NamedTuple, params::Dict) get!(params, :refresh, false) params[:t0] = 0 iter = Observable(0) - data = Dict{Symbol, Observable{MovingWindow}}(:iter => Node(MovingWindow(window, Int))) + data = Dict{Symbol, Observable{MovingWindow}}(:iter => Observable(MovingWindow(window, Int))) axis_dict = Dict() stats_dict = Dict() for (i, variable) in enumerate(keys(vars)) plots = vars[variable] - data[variable] = Node(MovingWindow(window, Float32)) + data[variable] = Observable(MovingWindow(window, Float32)) axis_dict[(variable, :varname)] = fig[i, 1, Left()] = Label(fig, string(variable), textsize = 30) axis_dict[(variable, :varname)].padding = (0, 60, 0, 0) onlineplot!(fig, axis_dict, plots, stats_dict, iter, data, variable, i) diff --git a/test/Project.toml b/test/Project.toml index 8991299..a807b4b 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -9,4 +9,4 @@ Turing = "fce5fe82-541a-59a6-adf8-730c64b5f9a0" CairoMakie = "0.6" ColorSchemes = "3" OnlineStats = "1" -Turing = "0.15, 0.16, 0.17, 0.18, 0.19" \ No newline at end of file +Turing = "0.20" \ No newline at end of file