From 9e01d6ef3fe9606720e2c3d44560e3a60092e363 Mon Sep 17 00:00:00 2001 From: Frankie Robertson Date: Sun, 21 Dec 2025 14:23:57 +0200 Subject: [PATCH 1/4] Fix typo in deactivate!(watchdog::WatchdogTask) --- src/Comparison/watchdog.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Comparison/watchdog.jl b/src/Comparison/watchdog.jl index 7a4fda8..16fc0ae 100644 --- a/src/Comparison/watchdog.jl +++ b/src/Comparison/watchdog.jl @@ -146,9 +146,9 @@ function deactivate!(watchdog::WatchdogTask) if istaskdone(watchdog.task) wait(watchdog.task) end - put(watchdog.channel, (; active=false)) + put!(watchdog.channel, (; active=false)) end struct NullWatchdog <: AbstractWatchdogTask end function reset!(::NullWatchdog, msg=nothing) end -function deactivate!(::NullWatchdog) end \ No newline at end of file +function deactivate!(::NullWatchdog) end From 785d5bfe923f0a2fed324d9db6583227ccc71ef7 Mon Sep 17 00:00:00 2001 From: Frankie Robertson Date: Sun, 21 Dec 2025 14:25:03 +0200 Subject: [PATCH 2/4] Handle unknown request type in CatRecorder constructor --- src/Sim/recorder.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Sim/recorder.jl b/src/Sim/recorder.jl index b897a88..37d282a 100644 --- a/src/Sim/recorder.jl +++ b/src/Sim/recorder.jl @@ -269,6 +269,8 @@ function CatRecorder(dims::Int, expected_responses::Int; requests...) data = empty_capacity(Float64, dims, length(request.points), expected_responses) end extra = (; points = request.points) + else + error("Unknown request type: $(request.type)") end push!(out, (name => (; label=haskey(request, :label) ? request.label : name_to_label(name), From 0632f0a2cf88fa3ff43ed8f8fdfde90fee0c7065 Mon Sep 17 00:00:00 2001 From: Frankie Robertson Date: Sun, 21 Dec 2025 14:31:02 +0200 Subject: [PATCH 3/4] Make docs and test workspaces --- Project.toml | 15 +++------------ test/Project.toml | 10 ++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 test/Project.toml diff --git a/Project.toml b/Project.toml index 4e24eff..055747a 100644 --- a/Project.toml +++ b/Project.toml @@ -41,7 +41,6 @@ TestExt = "Test" [compat] Accessors = "^0.1.12" -Aqua = "0.8" AutoHashEquals = "2" ConstructionBase = "^1.2" DataFrames = "1.6.1" @@ -54,13 +53,11 @@ FittedItemBanks = "^0.7.2" ForwardDiff = "1" HypothesisTests = "^0.10.12, ^0.11.0" Interpolations = "^0.14, ^0.15" -JET = "^0.9" Lazy = "0.15" LinearAlgebra = "^1.11" LogarithmicNumbers = "1" MacroTools = "^0.5.6" Mmap = "^1.11" -Optim = "1.7.3" PrecompileTools = "1.2.1" PsychometricsBazaarBase = "^0.8.4" QuickHeaps = "0.2.2" @@ -72,13 +69,7 @@ StaticArrays = "1" StatsBase = "^0.34" StatsFuns = "^0.9.15, ^1" Test = "^1.11" -julia = "^1.11" +julia = "^1.12" -[extras] -Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" -JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" -Optim = "429524aa-4258-5aef-a3af-852621145aeb" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - -[targets] -test = ["Aqua", "JET", "Optim", "Test"] +[workspace] +projects = ["docs", "test"] diff --git a/test/Project.toml b/test/Project.toml new file mode 100644 index 0000000..fe8df4c --- /dev/null +++ b/test/Project.toml @@ -0,0 +1,10 @@ +[deps] +Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" +ComputerAdaptiveTesting = "5a0d4f34-1f62-4a66-80fe-87aba0485488" +Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" +FittedItemBanks = "3f797b09-34e4-41d7-acf6-3302ae3248a5" +JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" +Optim = "429524aa-4258-5aef-a3af-852621145aeb" +PsychometricsBazaarBase = "b0d9cada-d963-45e9-a4c6-4746243987f1" +Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" From e48957792783c3366e6133eae1bbc8f5d92cc651 Mon Sep 17 00:00:00 2001 From: Frankie Robertson Date: Sun, 21 Dec 2025 14:34:12 +0200 Subject: [PATCH 4/4] Update Julia 1.11 => 1.12 --- .github/workflows/CI.yml | 4 ++-- .github/workflows/benchmark_pr.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index dbbac65..2e526b1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: version: - - '1.11' + - '1.12' os: - ubuntu-latest arch: @@ -48,7 +48,7 @@ jobs: miniforge-version: latest - uses: julia-actions/setup-julia@v1 with: - version: '1.11' + version: '1.12' - name: Set CAT packages to develop & resolve env run: | julia --project=docs/ -e 'using Pkg; diff --git a/.github/workflows/benchmark_pr.yml b/.github/workflows/benchmark_pr.yml index 4878aeb..ec8d883 100644 --- a/.github/workflows/benchmark_pr.yml +++ b/.github/workflows/benchmark_pr.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v2 with: - version: "1.11" + version: "1.12" - uses: julia-actions/cache@v2 - name: Extract Package Name from Project.toml id: extract-package-name