Merge pull request #103 from JuliaAI/dev

for a 1.1.1 release

Author: ablaom

Project.toml

@@ -1,26 +1,26 @@
 name = "MLJModelInterface"
 uuid = "e80e1ace-859a-464e-9ed9-23947d8ae3ea"
 authors = ["Thibaut Lienart and Anthony Blaom"]
-version = "1.1.0"
+version = "1.1.1"
 
 [deps]
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-ScientificTypes = "321657f4-b219-11e9-178b-2701a2544e81"
+ScientificTypesBase = "30f210dd-8aff-4c5f-94ba-8e64358c1161"
 StatisticalTraits = "64bff920-2084-43da-a3e6-9bb72801c0c9"
 
 [compat]
-ScientificTypes = "1"
-StatisticalTraits = "1.1"
+ScientificTypesBase = "1"
+StatisticalTraits = "2"
 julia = "1"
 
 [extras]
 CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
-MLJScientificTypes = "2e2323e0-db8b-457b-ae0d-bdfb3bc63afd"
+ScientificTypes = "321657f4-b219-11e9-178b-2701a2544e81"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "Tables", "Distances", "CategoricalArrays", "InteractiveUtils", "DataFrames", "MLJScientificTypes"]
+test = ["CategoricalArrays", "DataFrames", "Distances", "InteractiveUtils", "ScientificTypes", "Tables", "Test"]

src/MLJModelInterface.jl

@@ -27,8 +27,8 @@ const MODEL_TRAITS = [
     :deep_properties]
 
 # ------------------------------------------------------------------------
-# Dependencies (ScientificTypes and StatisticalTraits have none)
-using ScientificTypes
+# Dependencies
+using ScientificTypesBase
 using StatisticalTraits
 using Random
 
@@ -66,7 +66,7 @@ export matrix, int, classes, decoder, table,
 # equality
 export is_same_except, isrepresented
 
-# re-exports from ScientificTypes
+# re-exports from ScientificTypesBase
 export Scientific, Found, Unknown, Known, Finite, Infinite,
        OrderedFactor, Multiclass, Count, Continuous, Textual,
        Binary, ColorImage, GrayImage, Image, Table

test/data_utils.jl

@@ -70,7 +70,7 @@ end
     ary = rand(10, 3)
     @test M.schema(ary) === nothing
     M.schema(::FI, ::Val{:table}, X; kw...) =
-        MLJScientificTypes.schema(X; kw...) 
+        ScientificTypes.schema(X; kw...) 
     df = DataFrame(A = rand(10), B = categorical(rand('a':'c', 10)))
     sch = M.schema(df)
     @test sch.names == (:A, :B)

test/runtests.jl

@@ -1,11 +1,11 @@
 using Test, MLJModelInterface
-using ScientificTypes, MLJScientificTypes
+using ScientificTypesBase, ScientificTypes
 using Tables, Distances, CategoricalArrays, InteractiveUtils
 import DataFrames: DataFrame
 
 const M  = MLJModelInterface
 const FI = M.FullInterface
-ScientificTypes.TRAIT_FUNCTION_GIVEN_NAME[:table] = Tables.istable
+ScientificTypesBase.TRAIT_FUNCTION_GIVEN_NAME[:table] = Tables.istable
 
 setlight() = M.set_interface_mode(M.LightInterface())
 setfull()  = M.set_interface_mode(M.FullInterface())