Merge branch 'submodulev3' of github.com:ssec-jhu/scikit-learn into submodulev3

Author: SamuelCarliles3

.gitattributes

@@ -0,0 +1,6 @@
+.* export-ignore
+asv_benchmarks export-ignore
+azure-pipelines.yml export-ignore
+benchmarks export-ignore
+build_tools export-ignore
+maint_tools export-ignore

.github/workflows/check-manifest.yml renamed to .github/workflows/check-sdist.yml

@@ -1,11 +1,11 @@
-name: "Check Manifest"
+name: "Check sdist"
 
 on:
   schedule:
     - cron: '0 0 * * *'
 
 jobs:
-  check-manifest:
+  check-sdist:
     # Don't run on forks
     if: github.repository == 'scikit-learn/scikit-learn'
 
@@ -19,15 +19,15 @@ jobs:
         # scipy and cython are required to build sdist
         run: |
           python -m pip install --upgrade pip
-          pip install check-manifest scipy cython
+          pip install check-sdist
       - run: |
-          check-manifest -v
+          check-sdist --inject-junk
 
   update-tracker:
     uses: ./.github/workflows/update_tracking_issue.yml
     if: ${{ always() }}
-    needs: [check-manifest]
+    needs: [check-sdist]
     with:
-      job_status: ${{ needs.check-manifest.result }}
+      job_status: ${{ needs.check-sdist.result }}
     secrets:
       BOT_GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}

.pre-commit-config.yaml

@@ -12,11 +12,11 @@ repos:
     -   id: ruff
         args: ["--fix", "--output-format=full"]
 -   repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 24.3.0
     hooks:
     -   id: black
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.3.0
+    rev: v1.9.0
     hooks:
      -  id: mypy
         files: sklearn/

COPYING

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2007-2023 The scikit-learn developers.
+Copyright (c) 2007-2024 The scikit-learn developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

SECURITY.md

@@ -4,8 +4,8 @@
 
 | Version       | Supported          |
 | ------------- | ------------------ |
-| 1.4.1.post1   | :white_check_mark: |
-| < 1.4.1.post1 | :x:                |
+| 1.4.2         | :white_check_mark: |
+| < 1.4.2       | :x:                |
 
 ## Reporting a Vulnerability
 

asv_benchmarks/asv.conf.json

@@ -78,7 +78,7 @@
     "matrix": {
         "numpy": ["1.25.2"],
         "scipy": ["1.11.2"],
-        "cython": ["3.0.9"],
+        "cython": ["3.0.10"],
         "joblib": ["1.3.2"],
         "threadpoolctl": ["3.2.0"],
         "pandas": ["2.1.0"]

azure-pipelines.yml

@@ -124,9 +124,9 @@ jobs:
     vmImage: ubuntu-22.04
   variables:
     # Need to match Python version and Emscripten version for the correct
-    # Pyodide version. For example, for Pyodide version 0.25.0, see
-    # https://github.com/pyodide/pyodide/blob/0.25.0/Makefile.envs
-    PYODIDE_VERSION: '0.25.0'
+    # Pyodide version. For example, for Pyodide version 0.25.1, see
+    # https://github.com/pyodide/pyodide/blob/0.25.1/Makefile.envs
+    PYODIDE_VERSION: '0.25.1'
     EMSCRIPTEN_VERSION: '3.1.46'
     PYTHON_VERSION: '3.11.3'
 

build_tools/azure/debian_atlas_32bit_lock.txt

@@ -8,7 +8,7 @@ attrs==23.2.0
     # via pytest
 coverage==7.4.4
     # via pytest-cov
-cython==3.0.9
+cython==3.0.10
     # via -r build_tools/azure/debian_atlas_32bit_requirements.txt
 iniconfig==2.0.0
     # via pytest

build_tools/azure/debian_atlas_32bit_requirements.txt

@@ -1,7 +1,7 @@
 # DO NOT EDIT: this file is generated from the specification found in the
 # following script to centralize the configuration for CI builds:
 # build_tools/update_environments_and_lock_files.py
-cython==3.0.9  # min
+cython==3.0.10  # min
 joblib==1.2.0  # min
 threadpoolctl==2.2.0
 pytest==7.1.2  # min