Skip to content

Commit bccb068

Browse files
authored
Merge pull request #296 from alan-turing-institute/drop-mljlinearmodels
Temporarily suspend some testing because of a test pkg conflict
2 parents 0e730ae + eb8a0ee commit bccb068

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

Project.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,10 @@ Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
4747
GLM = "38e38edf-8417-5370-95a0-9cbb8c7f171a"
4848
GaussianProcesses = "891a1506-143c-57d2-908e-e1f8e92e6de9"
4949
LIBSVM = "b1bec4e5-fd48-53fe-b0cb-9723c09d164b"
50-
MLJLinearModels = "6ee0df7b-362f-4a72-a706-9e79364fb692"
5150
NaiveBayes = "9bbee03b-0db5-5f46-924f-b5c9c21b8c60"
5251
NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce"
5352
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
5453
XGBoost = "009559a3-9522-5dbb-924b-0b6ed2b22bb9"
5554

5655
[targets]
57-
test = ["Clustering", "DecisionTree", "Distances", "GLM", "GaussianProcesses", "LIBSVM", "MLJLinearModels", "NaiveBayes", "NearestNeighbors", "Test", "XGBoost"]
56+
test = ["Clustering", "DecisionTree", "Distances", "GLM", "GaussianProcesses", "LIBSVM", "NaiveBayes", "NearestNeighbors", "Test", "XGBoost"]

test/loading.jl

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,14 @@ using MLJModels
3434

3535
@test Foo() == RidgeRegressor()
3636

37-
# load a model with same name from different package:
38-
@test_logs (:warn, r"New model type") begin
39-
load("RidgeRegressor",
40-
pkg="MLJLinearModels",
41-
modl=TestLoading,
42-
verbosity=0)
43-
end
37+
# TODO: re-instate when Optim.jl updates its [compat] for FillArrays:
38+
# https://github.com/JuliaNLSolvers/Optim.jl/pull/840
39+
40+
# # load a model with same name from different package: @test_logs
41+
# (:warn, r"New model type") begin load("RidgeRegressor",
42+
# pkg="MLJLinearModels", modl=TestLoading, verbosity=0) end
4443

45-
@test typeof(RidgeRegressor2()) != typeof(RidgeRegressor())
44+
# @test typeof(RidgeRegressor2()) != typeof(RidgeRegressor())
4645

4746
# try to use the name of an existing object for new type name
4847
@test_throws Exception load("DecisionTreeClassifier",
@@ -61,4 +60,3 @@ end
6160
end # module
6261

6362
true
64-

0 commit comments

Comments
 (0)