Skip to content

Commit 9276d53

Browse files
authored
Merge pull request #578 from JuliaAI/dev
For a 0.17.5 release
2 parents 9d4c476 + 7aebcbf commit 9276d53

File tree

10 files changed

+481
-357
lines changed

10 files changed

+481
-357
lines changed

.github/codecov.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@ coverage:
22
status:
33
project:
44
default:
5-
threshold: 0.5%
5+
threshold: 0.5%
6+
removed_code_behavior: fully_covered_patch
7+
patch:
8+
default:
9+
target: 80

.github/workflows/ci.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
matrix:
1919
version:
2020
- '1.6'
21+
- '1.10'
2122
- '1'
2223
os:
2324
- ubuntu-latest
@@ -42,6 +43,8 @@ jobs:
4243
- uses: julia-actions/julia-buildpkg@v1
4344
- uses: julia-actions/julia-runtest@v1
4445
- uses: julia-actions/julia-processcoverage@v1
45-
- uses: codecov/codecov-action@v3
46+
- uses: codecov/codecov-action@v4
4647
with:
47-
file: lcov.info
48+
token: ${{ secrets.CODECOV_TOKEN }}
49+
fail_ci_if_error: false
50+
verbose: true

Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "MLJModels"
22
uuid = "d491faf4-2d78-11e9-2867-c94bc002c0b7"
33
authors = ["Anthony D. Blaom <[email protected]>"]
4-
version = "0.17.4"
4+
version = "0.17.5"
55

66
[deps]
77
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# MLJModels
22

33
[![Build Status](https://github.com/JuliaAI/MLJModels.jl/workflows/CI/badge.svg)](https://github.com/JuliaAI/MLJModels.jl/actions)
4+
[![codecov](https://codecov.io/gh/JuliaAI/MLJModels.jl/graph/badge.svg?token=KgarnnCc0K)](https://codecov.io/gh/JuliaAI/MLJModels.jl)
45

56
Repository of the "built-in" models available for use in the
67
[MLJ](https://github.com/JuliaAI/MLJ.jl) MLJ machine

src/MLJModels.jl

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ include("metadata.jl")
7272

7373
# read in the metadata:
7474
metadata_file = joinpath(srcdir, "registry", "Metadata.toml")
75+
Base.include_dependency(metadata_file)
7576
const INFO_GIVEN_HANDLE = info_given_handle(metadata_file)
7677
const PKGS_GIVEN_NAME = pkgs_given_name(INFO_GIVEN_HANDLE)
7778
const AMBIGUOUS_NAMES = ambiguous_names(INFO_GIVEN_HANDLE)

src/registry/Metadata.toml

+455-347
Large diffs are not rendered by default.

src/registry/Models.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ MLJBalancing = ["BalancedBaggingClassifier", "BalancedModel"]
1717
Imbalance = ["RandomOversampler", "SMOTENC", "TomekUndersampler", "ClusterUndersampler", "SMOTE", "SMOTEN", "ROSE", "RandomUndersampler", "ENNUndersampler", "BorderlineSMOTE1", "RandomWalkOversampler"]
1818
MLJTuning = ["TunedModel"]
1919
FeatureSelection = ["FeatureSelector", "RecursiveFeatureElimination"]
20-
Clustering = ["HierarchicalClustering", "DBSCAN", "KMeans", "KMedoids"]
20+
Clustering = ["HierarchicalClustering", "DBSCAN", "KMeans", "AffinityPropagation", "KMedoids"]
2121
EvoLinear = ["EvoSplineRegressor", "EvoLinearRegressor"]
2222
MLJText = ["TfidfTransformer", "CountTransformer", "BM25Transformer"]
2323
LightGBM = ["LGBMClassifier", "LGBMRegressor"]
24+
LaplaceRedux = ["LaplaceClassifier", "LaplaceRegressor"]
2425
XGBoost = ["XGBoostCount", "XGBoostRegressor", "XGBoostClassifier"]
25-
SymbolicRegression = ["MultitargetSRRegressor", "SRRegressor"]
2626
EvoTrees = ["EvoTreeClassifier", "EvoTreeGaussian", "EvoTreeMLE", "EvoTreeRegressor", "EvoTreeCount"]
27+
SymbolicRegression = ["MultitargetSRRegressor", "SRRegressor"]
2728
MLJModels = ["ConstantClassifier", "Standardizer", "DeterministicConstantClassifier", "UnivariateTimeTypeToContinuous", "OneHotEncoder", "ContinuousEncoder", "UnivariateBoxCoxTransformer", "InteractionTransformer", "ConstantRegressor", "UnivariateDiscretizer", "BinaryThresholdPredictor", "FillImputer", "DeterministicConstantRegressor", "UnivariateStandardizer", "UnivariateFillImputer"]
2829
OneRule = ["OneRuleClassifier"]
2930
OutlierDetectionPython = ["MCDDetector", "COPODDetector", "HBOSDetector", "IForestDetector", "SOSDetector", "ABODDetector", "LOFDetector", "PCADetector", "INNEDetector", "OCSVMDetector", "ECODDetector", "SODDetector", "LODADetector", "KDEDetector", "CDDetector", "KNNDetector", "GMMDetector", "COFDetector", "CBLOFDetector", "LOCIDetector", "LMDDDetector", "RODDetector"]

src/registry/Project.toml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ EvoTrees = "f6006082-12f8-11e9-0c9c-0d5d367ab1e5"
66
FeatureSelection = "33837fe5-dbff-4c9e-8c2f-c5612fe2b8b6"
77
Imbalance = "c709b415-507b-45b7-9a3d-1767c89fde68"
88
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
9+
LaplaceRedux = "c52c1a26-f7c5-402b-80be-ba1e638ad478"
910
LightGBM = "7acf609c-83a4-11e9-1ffb-b912bcd3b04a"
1011
MLJBalancing = "45f359ea-796d-4f51-95a5-deb1a414c586"
1112
MLJBase = "a7f614a8-145f-11e9-1d2a-a57a1082229d"

src/registry/src/constructors.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
**Private method.**
55
66
Return a dictionary of all subtypes of MLJ.Model, keyed on constructor. Where multiple
7-
types share a single constructor, there can only be one key, and which key appears is
7+
types share a single constructor, there can only be one value, and which value appears is
88
ambiguous.
99
1010
Typically a model type and it's constructor have the same name, but for wrappers, such as

test/runtests.jl

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
# The next two lines added as a workaround to
2-
# https://github.com/JuliaLang/Pkg.jl/issues/3628 (Julia 1.6):
31
import Pkg
4-
Pkg.add(name="Statistics", version=VERSION)
2+
3+
if Base.VERSION >= v"1.10-"
4+
# The issue with stdlib versions being fixed to 0.0.0 has been fixed in new versions of Julia
5+
else
6+
# The next line added as a workaround to
7+
# https://github.com/JuliaLang/Pkg.jl/issues/3628 (Julia 1.6):
8+
Pkg.add(name="Statistics", version=VERSION, uuid="10745b16-79ce-11e8-11f9-7d13ad32a3b2")
9+
end
510

611
using Test, MLJModels
712

0 commit comments

Comments
 (0)