Merge pull request #4 from alan-turing-institute/ScikitLearn

Scikit learn
JuliaAI · Feb 26, 2019 · 02497bb · 02497bb
2 parents 71e294d + 93a617e
commit 02497bb
Show file tree

Hide file tree

Showing 6 changed files with 760 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,9 @@ notifications:
   email: false
 git:
   depth: 99999999
-
+env:
+  global:
+  - PYTHON=conda
 ## uncomment the following lines to allow failures on nightly julia
 ## (tests will run but not make your overall status red)
 matrix:

diff --git a/Project.toml b/Project.toml
@@ -11,14 +11,17 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MLJBase = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
+
 TOML = "191fdcea-f9f2-43e0-b922-d33f71e2abc3"
 
 [extras]
 Clustering = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5"
 DecisionTree = "7806a523-6efd-50cb-b5f6-3fa6f1930dbb"
 GLM = "38e38edf-8417-5370-95a0-9cbb8c7f171a"
 GaussianProcesses = "891a1506-143c-57d2-908e-e1f8e92e6de9"
+ScikitLearn = "3646fa90-6ef7-5e7e-9f22-8aca16db6324"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
+
 [targets]
-test = ["Clustering", "DecisionTree", "GLM", "GaussianProcesses", "Test"]
+test = ["Clustering", "DecisionTree", "GLM", "GaussianProcesses","ScikitLearn", "Test"]
diff --git a/src/MLJModels.jl b/src/MLJModels.jl
@@ -11,7 +11,9 @@ function __init__()
     @require GaussianProcesses="891a1506-143c-57d2-908e-e1f8e92e6de9" include("GaussianProcesses.jl")
     @require GLM="38e38edf-8417-5370-95a0-9cbb8c7f171a" include("GLM.jl")
     @require Clustering="aaaa29a8-35af-508c-8bc3-b662a17a0fe5" include("Clustering.jl")
+    @require ScikitLearn="3646fa90-6ef7-5e7e-9f22-8aca16db6324" include("ScikitLearn.jl")
 end
 
 
+
 end # module