Merge pull request #578 from JuliaAI/dev

For a 0.17.5 release
JuliaAI · Dec 16, 2024 · 9276d53 · 9276d53
2 parents 9d4c476 + 7aebcbf
commit 9276d53
Show file tree

Hide file tree

Showing 10 changed files with 481 additions and 357 deletions.
diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -2,4 +2,8 @@ coverage:
   status:
     project:
       default:
-        threshold: 0.5%
+        threshold: 0.5%
+        removed_code_behavior: fully_covered_patch
+    patch:
+      default:
+        target: 80
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,6 +18,7 @@ jobs:
       matrix:
         version:
           - '1.6'
+          - '1.10'
           - '1'
         os:
           - ubuntu-latest
@@ -42,6 +43,8 @@ jobs:
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
-          file: lcov.info
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: false
+          verbose: true 
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "MLJModels"
 uuid = "d491faf4-2d78-11e9-2867-c94bc002c0b7"
 authors = ["Anthony D. Blaom <[email protected]>"]
-version = "0.17.4"
+version = "0.17.5"
 
 [deps]
 CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # MLJModels
 
 [![Build Status](https://github.com/JuliaAI/MLJModels.jl/workflows/CI/badge.svg)](https://github.com/JuliaAI/MLJModels.jl/actions)
+[![codecov](https://codecov.io/gh/JuliaAI/MLJModels.jl/graph/badge.svg?token=KgarnnCc0K)](https://codecov.io/gh/JuliaAI/MLJModels.jl)
 
 Repository of the "built-in" models available for use in the
 [MLJ](https://github.com/JuliaAI/MLJ.jl) MLJ machine

diff --git a/src/MLJModels.jl b/src/MLJModels.jl
@@ -72,6 +72,7 @@ include("metadata.jl")
 
 # read in the metadata:
 metadata_file = joinpath(srcdir, "registry", "Metadata.toml")
+Base.include_dependency(metadata_file)
 const INFO_GIVEN_HANDLE = info_given_handle(metadata_file)
 const PKGS_GIVEN_NAME = pkgs_given_name(INFO_GIVEN_HANDLE)
 const AMBIGUOUS_NAMES = ambiguous_names(INFO_GIVEN_HANDLE)

diff --git a/src/registry/Metadata.toml b/src/registry/Metadata.toml
diff --git a/src/registry/Models.toml b/src/registry/Models.toml
@@ -17,13 +17,14 @@ MLJBalancing = ["BalancedBaggingClassifier", "BalancedModel"]
 Imbalance = ["RandomOversampler", "SMOTENC", "TomekUndersampler", "ClusterUndersampler", "SMOTE", "SMOTEN", "ROSE", "RandomUndersampler", "ENNUndersampler", "BorderlineSMOTE1", "RandomWalkOversampler"]
 MLJTuning = ["TunedModel"]
 FeatureSelection = ["FeatureSelector", "RecursiveFeatureElimination"]
-Clustering = ["HierarchicalClustering", "DBSCAN", "KMeans", "KMedoids"]
+Clustering = ["HierarchicalClustering", "DBSCAN", "KMeans", "AffinityPropagation", "KMedoids"]
 EvoLinear = ["EvoSplineRegressor", "EvoLinearRegressor"]
 MLJText = ["TfidfTransformer", "CountTransformer", "BM25Transformer"]
 LightGBM = ["LGBMClassifier", "LGBMRegressor"]
+LaplaceRedux = ["LaplaceClassifier", "LaplaceRegressor"]
 XGBoost = ["XGBoostCount", "XGBoostRegressor", "XGBoostClassifier"]
-SymbolicRegression = ["MultitargetSRRegressor", "SRRegressor"]
 EvoTrees = ["EvoTreeClassifier", "EvoTreeGaussian", "EvoTreeMLE", "EvoTreeRegressor", "EvoTreeCount"]
+SymbolicRegression = ["MultitargetSRRegressor", "SRRegressor"]
 MLJModels = ["ConstantClassifier", "Standardizer", "DeterministicConstantClassifier", "UnivariateTimeTypeToContinuous", "OneHotEncoder", "ContinuousEncoder", "UnivariateBoxCoxTransformer", "InteractionTransformer", "ConstantRegressor", "UnivariateDiscretizer", "BinaryThresholdPredictor", "FillImputer", "DeterministicConstantRegressor", "UnivariateStandardizer", "UnivariateFillImputer"]
 OneRule = ["OneRuleClassifier"]
 OutlierDetectionPython = ["MCDDetector", "COPODDetector", "HBOSDetector", "IForestDetector", "SOSDetector", "ABODDetector", "LOFDetector", "PCADetector", "INNEDetector", "OCSVMDetector", "ECODDetector", "SODDetector", "LODADetector", "KDEDetector", "CDDetector", "KNNDetector", "GMMDetector", "COFDetector", "CBLOFDetector", "LOCIDetector", "LMDDDetector", "RODDetector"]

diff --git a/src/registry/Project.toml b/src/registry/Project.toml
@@ -6,6 +6,7 @@ EvoTrees = "f6006082-12f8-11e9-0c9c-0d5d367ab1e5"
 FeatureSelection = "33837fe5-dbff-4c9e-8c2f-c5612fe2b8b6"
 Imbalance = "c709b415-507b-45b7-9a3d-1767c89fde68"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+LaplaceRedux = "c52c1a26-f7c5-402b-80be-ba1e638ad478"
 LightGBM = "7acf609c-83a4-11e9-1ffb-b912bcd3b04a"
 MLJBalancing = "45f359ea-796d-4f51-95a5-deb1a414c586"
 MLJBase = "a7f614a8-145f-11e9-1d2a-a57a1082229d"

diff --git a/src/registry/src/constructors.jl b/src/registry/src/constructors.jl
@@ -4,7 +4,7 @@
 **Private method.**
 
 Return a dictionary of all subtypes of MLJ.Model, keyed on constructor. Where multiple
-types share a single constructor, there can only be one key, and which key appears is
+types share a single constructor, there can only be one value, and which value appears is
 ambiguous.
 
 Typically a model type and it's constructor have the same name, but for wrappers, such as

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,7 +1,12 @@
-# The next two lines added as a workaround to
-# https://github.com/JuliaLang/Pkg.jl/issues/3628 (Julia 1.6):
 import Pkg
-Pkg.add(name="Statistics", version=VERSION)
+
+if Base.VERSION >= v"1.10-"
+    # The issue with stdlib versions being fixed to 0.0.0 has been fixed in new versions of Julia
+else
+    # The next line added as a workaround to
+    # https://github.com/JuliaLang/Pkg.jl/issues/3628 (Julia 1.6):
+    Pkg.add(name="Statistics", version=VERSION, uuid="10745b16-79ce-11e8-11f9-7d13ad32a3b2")
+end
 
 using Test, MLJModels