From 4d9fb34b25cfc3ad20bc16759e7a1b1b8b9e66b6 Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:02:05 +0100 Subject: [PATCH 1/4] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a396f922..f613f85f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,10 +4,12 @@ on: branches: - master - dev + - fixb push: branches: - master - dev + - fixb tags: '*' jobs: test: From de948445e1a4d9ce008b874cad6677604e169d05 Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:47:44 +0100 Subject: [PATCH 2/4] fix failing test --- test/mlj_model_interface.jl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/mlj_model_interface.jl b/test/mlj_model_interface.jl index 79849908..49febe16 100644 --- a/test/mlj_model_interface.jl +++ b/test/mlj_model_interface.jl @@ -133,6 +133,13 @@ mutable struct LisasBuilder n1::Int end +# UndefVarError accepts two inputs from julia > v"1.9" +_UndefVarError(var, scope) = @static if VERSION <= v"1.9" + UndefVarError(var) +else + UndefVarError(var, scope) +end + @testset "builder errors and issue #237" begin # create a builder with an intentional flaw; # `Chains` is undefined - it should be `Chain` @@ -153,7 +160,7 @@ end y = rand(Float32, 75) @test_logs( (:error, MLJFlux.ERR_BUILDER), - @test_throws UndefVarError(:Chains) MLJBase.fit(model, 0, X, y) + @test_throws _UndefVarError(:Chains, Flux) MLJBase.fit(model, 0, X, y) ) end From a630c52396f2fdd75e3b5f750f67b63f13536e56 Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:57:32 +0100 Subject: [PATCH 3/4] Update mlj_model_interface.jl --- test/mlj_model_interface.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/mlj_model_interface.jl b/test/mlj_model_interface.jl index 49febe16..bc745836 100644 --- a/test/mlj_model_interface.jl +++ b/test/mlj_model_interface.jl @@ -134,7 +134,7 @@ mutable struct LisasBuilder end # UndefVarError accepts two inputs from julia > v"1.9" -_UndefVarError(var, scope) = @static if VERSION <= v"1.9" +_UndefVarError(var, scope) = @static if VERSION < v"1.10" UndefVarError(var) else UndefVarError(var, scope) From d42dbccbcba960680274541eb97148fdeacfcb48 Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Wed, 13 Nov 2024 13:13:49 +0100 Subject: [PATCH 4/4] Update ci.yml --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f613f85f..a396f922 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,12 +4,10 @@ on: branches: - master - dev - - fixb push: branches: - master - dev - - fixb tags: '*' jobs: test: