From a4096310ce0f3e8c703db0f84d1cdf8eb7992a4e Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Thu, 2 Apr 2020 18:51:41 +0100 Subject: [PATCH 01/13] testing to see changes --- Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Project.toml b/Project.toml index a52253d8..a7c44f15 100644 --- a/Project.toml +++ b/Project.toml @@ -39,6 +39,7 @@ StatsBase = "^0.32" Tables = "^0.2,^1.0" julia = "1" + [extras] Clustering = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5" DecisionTree = "7806a523-6efd-50cb-b5f6-3fa6f1930dbb" From 426e943da38d536f945c800d5ebbba2cf2eaa71a Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Thu, 2 Apr 2020 19:02:39 +0100 Subject: [PATCH 02/13] Update .travis.yml --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 98fb5b11..41373f00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,12 @@ ## Documentation: http://docs.travis-ci.com/user/languages/julia/ language: julia os: - - linux + #- linux - osx julia: - - 1.0 - - 1.1 - - 1.2 + #- 1.0 + #- 1.1 + #- 1.2 - 1.3 - 1.4 - nightly From 818fa114ae4c77178d87da0cc12eb5e452c6ec79 Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Thu, 2 Apr 2020 19:36:03 +0100 Subject: [PATCH 03/13] Update runtests.jl --- test/runtests.jl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 2559b6bf..9efbc196 100755 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,5 +1,9 @@ using Test, MLJModels +@testset "ScikitLearn " begin + @test include("ScikitLearn/ScikitLearn.jl") +end + @testset "metadata" begin @testset "reading and extracting model metadata" begin @test include("metadata.jl") @@ -37,13 +41,11 @@ end @test include("Clustering.jl") end -@testset "GLM " begin - @test include("GLM.jl") -end +#@testset "GLM " begin + # @test include("GLM.jl") +#end + -@testset "ScikitLearn " begin - @test include("ScikitLearn/ScikitLearn.jl") -end @testset "LIBSVM " begin @test include("LIBSVM.jl") From e4fcfcbbad6f23a4185fc4b4dd7ffa114dfcaecf Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Thu, 2 Apr 2020 19:52:51 +0100 Subject: [PATCH 04/13] Update Project.toml --- Project.toml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Project.toml b/Project.toml index a7c44f15..d23756c7 100644 --- a/Project.toml +++ b/Project.toml @@ -40,19 +40,3 @@ Tables = "^0.2,^1.0" julia = "1" -[extras] -Clustering = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5" -DecisionTree = "7806a523-6efd-50cb-b5f6-3fa6f1930dbb" -Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" -GLM = "38e38edf-8417-5370-95a0-9cbb8c7f171a" -GaussianProcesses = "891a1506-143c-57d2-908e-e1f8e92e6de9" -LIBSVM = "b1bec4e5-fd48-53fe-b0cb-9723c09d164b" -NaiveBayes = "9bbee03b-0db5-5f46-924f-b5c9c21b8c60" -NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce" -RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b" -ScikitLearn = "3646fa90-6ef7-5e7e-9f22-8aca16db6324" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -XGBoost = "009559a3-9522-5dbb-924b-0b6ed2b22bb9" - -[targets] -test = ["Clustering", "DecisionTree", "Distances", "GLM", "GaussianProcesses", "LIBSVM", "NaiveBayes", "NearestNeighbors", "ScikitLearn", "RDatasets", "Test", "XGBoost"] From d35e2daa12387e09b9f78480cefa3bd8b247395c Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Thu, 2 Apr 2020 20:28:45 +0100 Subject: [PATCH 05/13] Project.toml --- test/Project.toml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 test/Project.toml diff --git a/test/Project.toml b/test/Project.toml new file mode 100644 index 00000000..13be542f --- /dev/null +++ b/test/Project.toml @@ -0,0 +1,31 @@ +name = "MLJModels" +uuid = "d491faf4-2d78-11e9-2867-c94bc002c0b7" +authors = ["Anthony D. Blaom "] +version = "0.9.1" + + +[deps] +Clustering = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5" +DecisionTree = "7806a523-6efd-50cb-b5f6-3fa6f1930dbb" +Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" +GaussianProcesses = "891a1506-143c-57d2-908e-e1f8e92e6de9" +LIBSVM = "b1bec4e5-fd48-53fe-b0cb-9723c09d164b" +NaiveBayes = "9bbee03b-0db5-5f46-924f-b5c9c21b8c60" +NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce" +RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b" +ScikitLearn = "3646fa90-6ef7-5e7e-9f22-8aca16db6324" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +XGBoost = "009559a3-9522-5dbb-924b-0b6ed2b22bb9" + +[compat] +Clustering = "0.13" +DecisionTree = "0.10" +Distances = "0.8" +GaussianProcesses = "0.11" +julia = "1" +LIBSVM = "0.4" +NaiveBayes = "0.4" +NearestNeighbors = "0.4" +RDatasets = "0.6" +ScikitLearn = "0.6" +XGBoost = "0.4" From 7ff51bd6ac3e46014bf61cd160a5079786021db9 Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Thu, 2 Apr 2020 20:39:17 +0100 Subject: [PATCH 06/13] Update Project.toml --- test/Project.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/Project.toml b/test/Project.toml index 13be542f..62fd4204 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -1,8 +1,3 @@ -name = "MLJModels" -uuid = "d491faf4-2d78-11e9-2867-c94bc002c0b7" -authors = ["Anthony D. Blaom "] -version = "0.9.1" - [deps] Clustering = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5" From ac13d7abcf5b9d332f9b2661a3c410dde8138f6d Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Thu, 2 Apr 2020 20:44:46 +0100 Subject: [PATCH 07/13] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index d23756c7..7627eba5 100644 --- a/Project.toml +++ b/Project.toml @@ -35,7 +35,7 @@ OrderedCollections = "^1.1" Parameters = "^0.12" Requires = "^0.5, ^1" ScientificTypes = "^0.7" -StatsBase = "^0.32" +StatsBase = "^0.33" Tables = "^0.2,^1.0" julia = "1" From fcc8c8704a012fbe50afd0b79ae90f233feb5e15 Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Fri, 3 Apr 2020 08:28:00 +0100 Subject: [PATCH 08/13] Delete Project.toml --- test/Project.toml | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 test/Project.toml diff --git a/test/Project.toml b/test/Project.toml deleted file mode 100644 index 62fd4204..00000000 --- a/test/Project.toml +++ /dev/null @@ -1,26 +0,0 @@ - -[deps] -Clustering = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5" -DecisionTree = "7806a523-6efd-50cb-b5f6-3fa6f1930dbb" -Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" -GaussianProcesses = "891a1506-143c-57d2-908e-e1f8e92e6de9" -LIBSVM = "b1bec4e5-fd48-53fe-b0cb-9723c09d164b" -NaiveBayes = "9bbee03b-0db5-5f46-924f-b5c9c21b8c60" -NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce" -RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b" -ScikitLearn = "3646fa90-6ef7-5e7e-9f22-8aca16db6324" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -XGBoost = "009559a3-9522-5dbb-924b-0b6ed2b22bb9" - -[compat] -Clustering = "0.13" -DecisionTree = "0.10" -Distances = "0.8" -GaussianProcesses = "0.11" -julia = "1" -LIBSVM = "0.4" -NaiveBayes = "0.4" -NearestNeighbors = "0.4" -RDatasets = "0.6" -ScikitLearn = "0.6" -XGBoost = "0.4" From 18c0747de9737f9651d06fb1a7e9219f1a5ed640 Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Fri, 3 Apr 2020 08:30:25 +0100 Subject: [PATCH 09/13] Update Project.toml --- Project.toml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Project.toml b/Project.toml index 7627eba5..9e08a142 100644 --- a/Project.toml +++ b/Project.toml @@ -19,6 +19,7 @@ Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" Requires = "ae029012-a4dd-5104-9daa-d747884805df" ScientificTypes = "321657f4-b219-11e9-178b-2701a2544e81" +ScikitLearn = "3646fa90-6ef7-5e7e-9f22-8aca16db6324" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" @@ -38,5 +39,21 @@ ScientificTypes = "^0.7" StatsBase = "^0.33" Tables = "^0.2,^1.0" julia = "1" +ScikitLearn = "0.6" +[extras] +Clustering = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5" +DecisionTree = "7806a523-6efd-50cb-b5f6-3fa6f1930dbb" +Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" +GLM = "38e38edf-8417-5370-95a0-9cbb8c7f171a" +GaussianProcesses = "891a1506-143c-57d2-908e-e1f8e92e6de9" +LIBSVM = "b1bec4e5-fd48-53fe-b0cb-9723c09d164b" +NaiveBayes = "9bbee03b-0db5-5f46-924f-b5c9c21b8c60" +NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce" +RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b" +ScikitLearn = "3646fa90-6ef7-5e7e-9f22-8aca16db6324" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +XGBoost = "009559a3-9522-5dbb-924b-0b6ed2b22bb9" +[targets] +test = ["Clustering", "DecisionTree", "Distances", "GLM", "GaussianProcesses", "LIBSVM", "NaiveBayes", "NearestNeighbors", "ScikitLearn", "RDatasets", "Test", "XGBoost"] From 2d5eb7f5b60534bd022ff3949e92fc4b6cfdec97 Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Fri, 3 Apr 2020 08:40:26 +0100 Subject: [PATCH 10/13] Update Project.toml --- Project.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index 9e08a142..03fcd7c0 100644 --- a/Project.toml +++ b/Project.toml @@ -28,7 +28,7 @@ Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" CategoricalArrays = "^0.7" Compat = "^2" Distances = "^0.8" -Distributions = "^0.22,^0.23" +Distributions = ">=0.16" MLJBase = "^0.12" MLJModelInterface = "^0.2" MultivariateStats = "^0.7" @@ -36,7 +36,7 @@ OrderedCollections = "^1.1" Parameters = "^0.12" Requires = "^0.5, ^1" ScientificTypes = "^0.7" -StatsBase = "^0.33" +StatsBase = ">=0.24" Tables = "^0.2,^1.0" julia = "1" ScikitLearn = "0.6" From 890d135192af570cb83ae4676985b7b947764fa7 Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Fri, 3 Apr 2020 08:46:32 +0100 Subject: [PATCH 11/13] Update Project.toml --- Project.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Project.toml b/Project.toml index 03fcd7c0..b1ac5ed7 100644 --- a/Project.toml +++ b/Project.toml @@ -46,7 +46,6 @@ Clustering = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5" DecisionTree = "7806a523-6efd-50cb-b5f6-3fa6f1930dbb" Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" GLM = "38e38edf-8417-5370-95a0-9cbb8c7f171a" -GaussianProcesses = "891a1506-143c-57d2-908e-e1f8e92e6de9" LIBSVM = "b1bec4e5-fd48-53fe-b0cb-9723c09d164b" NaiveBayes = "9bbee03b-0db5-5f46-924f-b5c9c21b8c60" NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce" From 9c1097419b5188e9707e493d6438ec2f7df4b485 Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Fri, 3 Apr 2020 08:48:59 +0100 Subject: [PATCH 12/13] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index b1ac5ed7..0d8a380e 100644 --- a/Project.toml +++ b/Project.toml @@ -55,4 +55,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" XGBoost = "009559a3-9522-5dbb-924b-0b6ed2b22bb9" [targets] -test = ["Clustering", "DecisionTree", "Distances", "GLM", "GaussianProcesses", "LIBSVM", "NaiveBayes", "NearestNeighbors", "ScikitLearn", "RDatasets", "Test", "XGBoost"] +test = ["Clustering", "DecisionTree", "Distances", "GLM","LIBSVM", "NaiveBayes", "NearestNeighbors", "ScikitLearn", "RDatasets", "Test", "XGBoost"] From 984c7e83431187992f110cb1d2ddc2d0bd86e226 Mon Sep 17 00:00:00 2001 From: Okon Samuel <39421418+OkonSamuel@users.noreply.github.com> Date: Fri, 3 Apr 2020 09:37:54 +0100 Subject: [PATCH 13/13] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 0d8a380e..11cab20f 100644 --- a/Project.toml +++ b/Project.toml @@ -39,7 +39,7 @@ ScientificTypes = "^0.7" StatsBase = ">=0.24" Tables = "^0.2,^1.0" julia = "1" -ScikitLearn = "0.6" +ScikitLearn = "0.6.1" [extras] Clustering = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5"