scikit-learn · glemaitre · Aug 5, 2022 · Aug 4, 2022 · Apr 28, 2022 · Apr 29, 2022
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,133 +1,51 @@
 version: 2.1
 
+# Parameters required to trigger the execution
+# of the "doc-min-dependencies" and "doc" jobs
+parameters:
+  GITHUB_RUN_URL:
+    type: string
+    default: "none"
+
 jobs:
   doc-min-dependencies:
     docker:
       - image: cimg/python:3.8.12
     environment:
-      - OMP_NUM_THREADS: 2
-      - MKL_NUM_THREADS: 2
-      - CONDA_ENV_NAME: testenv
-      - PYTHON_VERSION: 3.8
-      - NUMPY_VERSION: 'min'
-      - SCIPY_VERSION: 'min'
-      - MATPLOTLIB_VERSION: 'min'
-      - CYTHON_VERSION: 'min'
-      - SCIKIT_IMAGE_VERSION: 'min'
-      - SPHINX_VERSION: 'min'
-      - PANDAS_VERSION: 'min'
-      - SPHINX_GALLERY_VERSION: 'min'
-      - NUMPYDOC_VERSION: 'min'
-      - SPHINX_PROMPT_VERSION: 'min'
-      - SPHINXEXT_OPENGRAPH_VERSION: 'min'
+      - GITHUB_ARTIFACT_URL: << pipeline.parameters.GITHUB_RUN_URL >>/doc-min-dependencies.zip
     steps:
       - checkout
-      - run: ./build_tools/circle/checkout_merge_commit.sh
-      - restore_cache:
-          key: v1-doc-min-deps-datasets-{{ .Branch }}
-      - restore_cache:
-          keys:
-            - doc-min-deps-ccache-{{ .Branch }}
-            - doc-min-deps-ccache
-      - run: ./build_tools/circle/build_doc.sh
-      - save_cache:
-          key: doc-min-deps-ccache-{{ .Branch }}-{{ .BuildNum }}
-          paths:
-            - ~/.ccache
-            - ~/.cache/pip
-      - save_cache:
-          key: v1-doc-min-deps-datasets-{{ .Branch }}
-          paths:
-            - ~/scikit_learn_data
+      - run: bash build_tools/circle/download_documentation.sh
       - store_artifacts:
           path: doc/_build/html/stable
           destination: doc
-      - store_artifacts:
-          path: ~/log.txt
-          destination: log.txt
 
   doc:
     docker:
       - image: cimg/python:3.8.12
     environment:
-      - OMP_NUM_THREADS: 2
-      - MKL_NUM_THREADS: 2
-      - CONDA_ENV_NAME: testenv
-      - PYTHON_VERSION: '3.9'
-      - NUMPY_VERSION: 'latest'
-      - SCIPY_VERSION: 'latest'
-      - MATPLOTLIB_VERSION: 'latest'
-      - CYTHON_VERSION: 'latest'
-      - SCIKIT_IMAGE_VERSION: 'latest'
-      # Bump the sphinx version from time to time. Avoid latest sphinx version
-      # that tends to break things slightly too often
-      - SPHINX_VERSION: 4.2.0
-      - PANDAS_VERSION: 'latest'
-      - SPHINX_GALLERY_VERSION: 'latest'
-      - NUMPYDOC_VERSION: 'latest'
-      - SPHINX_PROMPT_VERSION: 'latest'
-      - SPHINXEXT_OPENGRAPH_VERSION: 'latest'
+      - GITHUB_ARTIFACT_URL: << pipeline.parameters.GITHUB_RUN_URL >>/doc.zip
     steps:
       - checkout
-      - run: ./build_tools/circle/checkout_merge_commit.sh
-      - restore_cache:
-          key: v1-doc-datasets-{{ .Branch }}
-      - restore_cache:
-          keys:
-            - doc-ccache-{{ .Branch }}
-            - doc-ccache
-      - run: ./build_tools/circle/build_doc.sh
-      - save_cache:
-          key: doc-ccache-{{ .Branch }}-{{ .BuildNum }}
-          paths:
-            - ~/.ccache
-            - ~/.cache/pip
-      - save_cache:
-          key: v1-doc-datasets-{{ .Branch }}
-          paths:
-            - ~/scikit_learn_data
+      - run: bash build_tools/circle/download_documentation.sh
       - store_artifacts:
           path: doc/_build/html/stable
           destination: doc
-      - store_artifacts:
-          path: ~/log.txt
-          destination: log.txt
-      # Persists generated documentation so that it can be attached and deployed
-      # in the 'deploy' step.
+      # Persists the generated documentation, so that it
+      # can be attached and deployed in the "deploy" job
       - persist_to_workspace:
           root: doc/_build/html
           paths: .
 
-  lint:
-    docker:
-      - image: cimg/python:3.8.12
-    steps:
-      - checkout
-      - run: ./build_tools/circle/checkout_merge_commit.sh
-      - run:
-          name: dependencies
-          command: pip install flake8
-      - run:
-          name: linting
-          command: ./build_tools/circle/linting.sh
-
   linux-arm64:
     machine:
       image: ubuntu-2004:202101-01
     resource_class: arm.medium
     environment:
-      # Use the latest supported version of python
-      - PYTHON_VERSION: '3.9'
       - OMP_NUM_THREADS: 2
       - OPENBLAS_NUM_THREADS: 2
-      - NUMPY_VERSION: 'latest'
-      - SCIPY_VERSION: 'latest'
-      - CYTHON_VERSION: 'latest'
-      - JOBLIB_VERSION: 'latest'
-      - THREADPOOLCTL_VERSION: 'latest'
-      - PYTEST_VERSION: 'latest'
-      - PYTEST_XDIST_VERSION: 'latest'
-      - TEST_DOCSTRINGS: 'true'
+      - CONDA_ENV_NAME: testenv
+      - LOCK_FILE: build_tools/circle/py39_conda_forge_linux-aarch64_conda.lock
     steps:
       - checkout
       - run: ./build_tools/circle/checkout_merge_commit.sh
@@ -159,18 +77,23 @@ jobs:
 
 workflows:
   version: 2
+
   build-doc-and-deploy:
+    when:
+      not:
+        equal: [ "none", << pipeline.parameters.GITHUB_RUN_URL >> ]
+    # The jobs should run only when triggered by the workflow
     jobs:
-      - lint
-      - doc:
-          requires:
-            - lint
-      - doc-min-dependencies:
-          requires:
-            - lint
+      - doc-min-dependencies
+      - doc
       - deploy:
           requires:
             - doc
+
   linux-arm64:
+    when:
+      equal: [ "none", << pipeline.parameters.GITHUB_RUN_URL >> ]
+    # Prevent double execution of this job: on push
+    # by default and when triggered by the workflow
     jobs:
       - linux-arm64
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -0,0 +1,78 @@
+# Workflow to build the documentation
+name: Documentation builder
+
+on:
+  push:
+    branches:
+      - main
+      # Release branches
+      - "[0-9]+.[0-9]+.X"
+  pull_request:
+    branches:
+      - main
+      - "[0-9]+.[0-9]+.X"
+
+jobs:
+  # Build the documentation against the minimum version of the dependencies
+  doc-min-dependencies:
+    # This prevents this workflow from running on a fork.
+    # To test this workflow on a fork, uncomment the following line.
+    if: github.repository == 'scikit-learn/scikit-learn'
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout scikit-learn
+        uses: actions/checkout@v2
+        with:
+          # needed by build_doc.sh to compute the list of changed doc files:
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+
+      - name: Build documentation
+        run: bash build_tools/github/build_doc.sh
+        env:
+          OMP_NUM_THREADS: 2
+          MKL_NUM_THREADS: 2
+          CONDA_ENV_NAME: testenv
+          LOCK_FILE: build_tools/github/doc_min_dependencies_linux-64_conda.lock
+
+      - name: Upload documentation
+        uses: actions/upload-artifact@v2
+        with:
+          name: doc-min-dependencies
+          path: doc/_build/html/stable
+
+  # Build the documentation against the latest version of the dependencies
+  doc:
+    # This prevents this workflow from running on a fork.
+    # To test this workflow on a fork, uncomment the following line.
+    if: github.repository == 'scikit-learn/scikit-learn'
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout scikit-learn
+        uses: actions/checkout@v2
+        with:
+          # needed by build_doc.sh to compute the list of changed doc files:
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+
+      - name: Build documentation
+        run: bash build_tools/github/build_doc.sh
+        env:
+          OMP_NUM_THREADS: 2
+          MKL_NUM_THREADS: 2
+          CONDA_ENV_NAME: testenv
+          LOCK_FILE: build_tools/github/doc_linux-64_conda.lock
+
+      - name: Upload documentation
+        uses: actions/upload-artifact@v2
+        with:
+          name: doc
+          path: doc/_build/html/stable
diff --git a/.github/workflows/trigger-hosting.yml b/.github/workflows/trigger-hosting.yml
@@ -0,0 +1,30 @@
+# Workflow to trigger the jobs that will host the documentation
+name: Documentation push trigger
+on:
+  workflow_run:
+    # Run the workflow after the separate "Documentation builder" workflow completes
+    workflows: [Documentation builder]
+    types:
+      - completed
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+    # Run the job only if the "Documentation builder" workflow succeeded
+    # Prevents this workflow from running on a fork.
+    # To test this workflow on a fork remove the `github.repository == scikit-learn/scikit-learn` condition
+    if: github.repository == 'scikit-learn/scikit-learn' && github.event.workflow_run.conclusion == 'success'
+    steps:
+      - name: Checkout scikit-learn
+        uses: actions/checkout@v2
+
+      - name: Trigger hosting jobs
+        run: bash build_tools/github/trigger_hosting.sh
+        env:
+          CIRCLE_CI_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }}
+          EVENT: ${{ github.event.workflow_run.event }}
+          RUN_ID: ${{ github.event.workflow_run.id }}
+          HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }}
+          COMMIT_SHA:  ${{ github.event.workflow_run.head_sha }}
+          REPO_NAME:  ${{ github.event.workflow_run.head_repository.full_name }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-*.pyc
+*.pyc*
 *.so
 *.pyd
 *~

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.3.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
@@ -9,13 +9,13 @@ repos:
     rev: 22.3.0
     hooks:
     -   id: black
--   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+-   repo: https://github.com/pycqa/flake8
+    rev: 4.0.1
     hooks:
     -   id: flake8
         types: [file, python]
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.782
+    rev: v0.961
     hooks:
      -  id: mypy
         files: sklearn/

diff --git a/Makefile b/Makefile
@@ -63,6 +63,3 @@ doc-noplot: inplace
 code-analysis:
 	flake8 sklearn | grep -v __init__ | grep -v external
 	pylint -E -i y sklearn/ -d E1103,E0611,E1101
-
-flake8-diff:
-	git diff upstream/main -u -- "*.py" | flake8 --diff
diff --git a/README.rst b/README.rst
@@ -38,7 +38,7 @@
 .. |JoblibMinVersion| replace:: 1.0.0
 .. |ThreadpoolctlMinVersion| replace:: 2.0.0
 .. |MatplotlibMinVersion| replace:: 3.1.2
-.. |Scikit-ImageMinVersion| replace:: 0.14.5
+.. |Scikit-ImageMinVersion| replace:: 0.16.2
 .. |PandasMinVersion| replace:: 1.0.5
 .. |SeabornMinVersion| replace:: 0.9.0
 .. |PytestMinVersion| replace:: 5.0.1
@@ -144,7 +144,7 @@ directory (you will need to have ``pytest`` >= |PyTestMinVersion| installed)::
 
     pytest sklearn
 
-See the web page https://scikit-learn.org/dev/developers/advanced_installation.html#testing
+See the web page https://scikit-learn.org/dev/developers/contributing.html#testing-and-improving-test-coverage
 for more information.
 
     Random number generation can be controlled during testing by setting
@@ -184,6 +184,7 @@ Communication
 
 - Mailing list: https://mail.python.org/mailman/listinfo/scikit-learn
 - Gitter: https://gitter.im/scikit-learn/scikit-learn
+- Logos & Branding: https://github.com/scikit-learn/scikit-learn/tree/main/doc/logos
 - Blog: https://blog.scikit-learn.org
 - Calendar: https://blog.scikit-learn.org/calendar/
 - Twitter: https://twitter.com/scikit_learn
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    *.pyc
+    *.pyc*
     *.so
     *.pyd
     *~
@@ Expand Down @@