Merge pull request #187 from JuliaAI/dev

For a 0.7.4 release

Project.toml

@@ -1,7 +1,7 @@
 name = "MLJTuning"
 uuid = "03970b2e-30c4-11ea-3135-d1576263f10f"
 authors = ["Anthony D. Blaom <[email protected]>"]
-version = "0.7.3"
+version = "0.7.4"
 
 [deps]
 ComputationalResources = "ed09eef8-17a6-5b46-8889-db040fac31e3"
@@ -17,7 +17,7 @@ RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 ComputationalResources = "0.3"
 Distributions = "0.22,0.23,0.24, 0.25"
 LatinHypercubeSampling = "1.7.2"
-MLJBase = "0.20"
+MLJBase = "0.20, 0.21"
 ProgressMeter = "1.7.1"
 RecipesBase = "0.8,0.9,1"
 julia = "1.6"

test/serialization.jl

@@ -1,4 +1,3 @@
-
 module TestSerialization
 
 using Test
@@ -10,24 +9,21 @@ using ..Models
 function test_args(mach)
     # Check source nodes are empty if any
     for arg in mach.args
-        if arg isa Source 
+        if arg isa Source
             @test arg == source()
         end
     end
 end
 
-function test_data(mach)
-    @test !isdefined(mach, :old_rows)
-    @test !isdefined(mach, :data)
-    @test !isdefined(mach, :resampled_data)
-    @test !isdefined(mach, :cache)
+test_data(mach) = @test all([:old_rows, :data, :resampled_data, :cache]) do field
+    !isdefined(mach, field) || isnothing(getfield(mach, field))
 end
 
 function generic_tests(mach₁, mach₂)
     test_args(mach₂)
     test_data(mach₂)
     @test mach₂.state == -1
-    for field in (:frozen, :model, :old_model, :old_upstream_state, :fit_okay)
+    for field in (:frozen, :model, :old_model, :old_upstream_state)
         @test getfield(mach₁, field) == getfield(mach₂, field)
     end
 end
@@ -70,4 +66,4 @@ end
 
 end
 
-true
+true