8000 Merge remote-tracking branch 'origin/main' into sample-props · scikit-learn/scikit-learn@63e364a · GitHub
[go: up one dir, main page]
Skip to content

Commit 63e364a

Browse files
adrinjalaliadrinjalali
committed
Merge remote-tracking branch 'origin/main' into sample-props
2 parents dca29a6 + a994afb commit 63e364a

File tree

390 files changed

+10160
-6766
lines changed
  • test_compare_lightgbm.py
  • test_gradient_boosting.py
  • utils.pyx
  • _iforest.py
  • _stacking.py
  • _voting.py
  • tests
  • exceptions.py
  • feature_extraction
  • feature_selection
  • 10000
    impute
  • inspection
  • isotonic.py
  • kernel_approximation.py
  • linear_model
  • manifold
  • metrics
  • mixture/tests
  • model_selection
  • multiclass.py
  • multioutput.py
  • neighbors
  • neural_network
  • pipeline.py
  • preprocessing
  • random_projection.py
  • semi_supervised
  • svm
  • tests
  • tree
  • utils

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    390 files changed

    +10160
    -6766
    lines changed

    ‎.circleci/config.yml

    Lines changed: 73 additions & 47 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,63 +1,97 @@
    11
    version: 2.1
    22

    3-
    # Parameters required to trigger the execution
    4-
    # of the "doc-min-dependencies" and "doc" jobs
    5-
    parameters:
    6-
    GITHUB_RUN_URL:
    7-
    type: string
    8-
    default: "none"
    9-
    103
    jobs:
    11-
    doc-min-dependencies:
    4+
    lint:
    125
    docker:
    136
    - image: cimg/python:3.8.12
    14-
    environment:
    15-
    - GITHUB_ARTIFACT_URL: << pipeline.parameters.GITHUB_RUN_URL >>/doc-min-dependencies.zip
    167
    steps:
    178
    - checkout
    18-
    - run: bash build_tools/circle/download_documentation.sh
    19-
    - store_artifacts:
    20-
    path: doc/_build/html/stable
    21-
    destination: doc
    9+
    - run:
    10+
    name: dependencies
    11+
    command: |
    12+
    source build_tools/shared.sh
    13+
    # Include pytest compatibility with mypy
    14+
    pip install pytest flake8 $(get_dep mypy min) $(get_dep black min)
    15+
    - run:
    16+
    name: linting
    17+
    command: ./build_tools/linting.sh
    2218

    23-
    doc:
    19+
    doc-min-dependencies:
    2420
    docker:
    2521
    - image: cimg/python:3.8.12
    2622
    environment:
    27-
    - GITHUB_ARTIFACT_URL: << pipeline.parameters.GITHUB_RUN_URL >>/doc.zip
    23+
    - MKL_NUM_THREADS: 2
    24+
    - OPENBLAS_NUM_THREADS: 2
    25+
    - CONDA_ENV_NAME: testenv
    26+
    - LOCK_FILE: build_tools/circle/doc_min_dependencies_linux-64_conda.lock
    27+
    # Sphinx race condition in doc-min-dependencies is causing job to stall
    28+
    # Here we run the job serially
    29+
    - SPHINX_NUMJOBS: 1
    2830
    steps:
    2931
    - checkout
    30-
    - run: bash build_tools/circle/download_documentation.sh
    32+
    - run: ./build_tools/circle/checkout_merge_commit.sh
    33+
    - restore_cache:
    34+
    key: v1-doc-min-deps-datasets-{{ .Branch }}
    35+
    - restore_cache:
    36+
    keys:
    37+
    - doc-min-deps-ccache-{{ .Branch }}
    38+
    - doc-min-deps-ccache
    39+
    - run: ./build_tools/circle/build_doc.sh
    40+
    - save_cache:
    41+
    key: doc-min-deps-ccache-{{ .Branch }}-{{ .BuildNum }}
    42+
    paths:
    43+
    - ~/.ccache
    44+
    - ~/.cache/pip
    45+
    - save_cache:
    46+
    key: v1-doc-min-deps-datasets-{{ .Branch }}
    47+
    paths:
    48+
    - ~/scikit_learn_data
    3149
    - store_artifacts:
    3250
    path: doc/_build/html/stable
    3351
    destination: doc
    34-
    # Persists the generated documentation, so that it
    35-
    # can be attached and deployed in the "deploy" job
    36-
    - persist_to_workspace:
    37-
    root: doc/_build/html
    38-
    paths: .
    52+
    - store_artifacts:
    53+
    path: ~/log.txt
    54+
    destination: log.txt
    3955

    40-
    linux-arm64:
    41-
    machine:
    42-
    image: ubuntu-2004:202101-01
    43-
    resource_class: arm.medium
    56+
    doc:
    57+
    docker:
    58+
    - image: cimg/python:3.8.12
    4459
    environment:
    45-
    - OMP_NUM_THREADS: 2
    60+
    - MKL_NUM_THREADS: 2
    4661
    - OPENBLAS_NUM_THREADS: 2
    4762
    - CONDA_ENV_NAME: testenv
    48-
    - LOCK_FILE: build_tools/circle/py39_conda_forge_linux-aarch64_conda.lock
    63+
    - LOCK_FILE: build_tools/circle/doc_linux-64_conda.lock
    4964
    steps:
    5065
    - checkout
    5166
    - run: ./build_tools/circle/checkout_merge_commit.sh
    5267
    - restore_cache:
    53-
    key: linux-arm64-ccache-v1-{{ .Branch }}
    54-
    - run: ./build_tools/circle/build_test_arm.sh
    68+
    key: v1-doc-datasets-{{ .Branch }}
    69+
    - restore_cache:
    70+
    keys:
    71+
    - doc-ccache-{{ .Branch }}
    72+
    - doc-ccache
    73+
    - run: ./build_tools/circle/build_doc.sh
    5574
    - save_cache:
    56-
    key: linux-arm64-ccache-v1-{{ .Branch }}
    75+
    key: doc-ccache-{{ .Branch }}-{{ .BuildNum }}
    5776
    paths:
    58-
    - ~/.cache/ccache
    77+
    - ~/.ccache
    5978
    - ~/.cache/pip
    79+
    - save_cache:
    80+
    key: v1-doc-datasets-{{ .Branch }}
    81+
    paths:
    6082
    - ~/scikit_learn_data
    83+
    - store_artifacts:
    84+
    path: doc/_build/html/stable
    85+
    destination: doc
    86+
    - store_artifacts:
    87+
    path: ~/log.txt
    88+
    destination: log.txt
    89+
    # Persists generated documentation so that it can be attached and deployed
    90+
    # in the 'deploy' step.
    91+
    - persist_to_workspace:
    92+
    root: doc/_build/html
    93+
    paths: .
    94+
    6195
    deploy:
    6296
    docker:
    6397
    - image: cimg/python:3.8.12
    @@ -77,23 +111,15 @@ jobs:
    77111
    78112
    workflows:
    79113
    version: 2
    80-
    81114
    build-doc-and-deploy:
    82-
    when:
    83-
    not:
    84-
    equal: [ "none", << pipeline.parameters.GITHUB_RUN_URL >> ]
    85-
    # The jobs should run only when triggered by the workflow
    86115
    jobs:
    87-
    - doc-min-dependencies
    88-
    - doc
    116+
    - lint
    117+
    - doc:
    118+
    requires:
    119+
    - lint
    120+
    - doc-min-dependencies:
    121+
    requires:
    122+
    - lint
    89123
    - deploy:
    90124
    requires:
    91125
    - doc
    92-
    93-
    linux-arm64:
    94-
    when:
    95-
    equal: [ "none", << pipeline.parameters.GITHUB_RUN_URL >> ]
    96-
    # Prevent double execution of this job: on push
    97-
    # by default and when triggered by the workflow
    98-
    jobs:
    99-
    - linux-arm64

    ‎.cirrus.star

    Lines changed: 8 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,10 +6,11 @@ load("cirrus", "env", "fs", "http")
    66
    def main(ctx):
    77
    # Only run for scikit-learn/scikit-learn. For debugging on a fork, you can
    88
    # comment out the following condition.
    9-
    # if env.get("CIRRUS_REPO_FULL_NAME") != "scikit-learn/scikit-learn":
    10-
    # return []
    9+
    if env.get("CIRRUS_REPO_FULL_NAME") != "scikit-learn/scikit-learn":
    10+
    return []
    1111

    1212
    arm_wheel_yaml = "build_tools/cirrus/arm_wheel.yml"
    13+
    arm_tests_yaml = "build_tools/cirrus/arm_tests.yml"
    1314

    1415
    # Nightly jobs always run
    1516
    if env.get("CIRRUS_CRON", "") == "nightly":
    @@ -25,7 +26,10 @@ def main(ctx):
    2526
    response = http.get(url).json()
    2627
    commit_msg = response["message"]
    2728

    28-
    if "[skip ci]" in commit_msg or ("[cd build]" not in commit_msg and "[cd build cirrus]" not in commit_msg):
    29+
    if "[skip ci]" in commit_msg:
    2930
    return []
    3031

    31-
    return fs.read(arm_wheel_yaml)
    32+
    if "[cd build]" in commit_msg or "[cd build cirrus]" in commit_msg:
    33+
    return fs.read(arm_wheel_yaml) + fs.read(arm_tests_yaml)
    34+
    35+
    return fs.read(arm_tests_yaml)

    ‎.github/workflows/artifact-redirector.yml

    Lines changed: 10 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,7 +1,17 @@
    1+
    name: CircleCI artifacts redirector
    12
    on: [status]
    3+
    4+
    # Restrict the permissions granted to the use of secrets.GITHUB_TOKEN in this
    5+
    # github actions workflow:
    6+
    # https://docs.github.com/en/actions/security-guides/automatic-token-authentication
    7+
    permissions:
    8+
    statuses: write
    9+
    210
    jobs:
    311
    circleci_artifacts_redirector_job:
    412
    runs-on: ubuntu-latest
    13+
    # For testing this action on a fork, remove the "github.repository =="" condition.
    14+
    if: "github.repository == 'scikit-learn/scikit-learn' && github.event.context == 'ci/circleci: doc'"
    515
    name: Run CircleCI artifacts redirector
    616
    steps:
    717
    - name: GitHub Action step

    ‎.github/workflows/assign.yml

    Lines changed: 6 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -4,6 +4,12 @@ on:
    44
    issue_comment:
    55
    types: created
    66

    7+
    # Restrict the permissions granted to the use of secrets.GITHUB_TOKEN in this
    8+
    # github actions workflow:
    9+
    # https://docs.github.com/en/actions/security-guides/automatic-token-authentication
    10+
    permissions:
    11+
    issues: write
    12+
    713
    jobs:
    814
    one:
    915
    runs-on: ubuntu-latest

    ‎.github/workflows/build-docs.yml

    Lines changed: 0 additions & 75 deletions
    This file was deleted.

    ‎.github/workflows/labeler-module.yml

    Lines changed: 7 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -3,6 +3,13 @@ on:
    33
    pull_request_target:
    44
    types: [opened]
    55

    6+
    # Restrict the permissions granted to the use of secrets.GITHUB_TOKEN in this
    7+
    # github actions workflow:
    8+
    # https://docs.github.com/en/actions/security-guides/automatic-token-authentication
    9+
    permissions:
    10+
    contents: read
    11+
    pull-requests: write
    12+
    613
    jobs:
    714
    triage:
    815
    runs-on: ubuntu-latest

    ‎.github/workflows/labeler-title-regex.yml

    Lines changed: 3 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -3,6 +3,9 @@ on:
    33
    pull_request_target:
    44
    types: [opened, edited]
    55

    6+
    # Restrict the permissions granted to the use of secrets.GITHUB_TOKEN in this
    7+
    # github actions workflow:
    8+
    # https://docs.github.com/en/actions/security-guides/automatic-token-authentication
    69
    permissions:
    710
    contents: read
    811
    pull-requests: write

    ‎.github/workflows/trigger-hosting.yml

    Lines changed: 0 additions & 30 deletions
    This file was deleted.

    ‎.github/workflows/unassign.yml

    Lines changed: 6 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -4,6 +4,12 @@ on:
    44
    issues:
    55
    types: unassigned
    66

    7+
    # Restrict the permissions granted to the use of secrets.GITHUB_TOKEN in this
    8+
    # github actions workflow:
    9+
    # https://docs.github.com/en/actions/security-guides/automatic-token-authentication
    10+
    permissions:
    11+
    issues: write
    12+
    713
    jobs:
    814
    one:
    915
    runs-on: ubuntu-latest

    0 commit comments

    Comments
     (0)
    0