8000 wip: merge main after merge of #27904 · fcharras/scikit-learn@046cf00 · GitHub
[go: up one dir, main page]
Skip to content

Commit 046cf00

Browse files
fcharrasfcharras
committed
wip: merge main after merge of scikit-learn#27904 
2 parents 219a7f5 + 082b588 commit 046cf00

File tree

491 files changed

+18449
-8770
lines changed
  • test_enable_iterative_imputer.py
  • test_enable_successive_halving.py
  • externals
  • feature_extraction
  • feature_selection
  • gaussian_process
  • impute
  • inspection
  • isotonic.py
  • linear_model
  • manifold
  • meson.build
  • metrics
  • mixture
  • model_selection
  • multiclass.py
  • multioutput.py
  • neighbors
  • neural_network
  • pipeline.py
  • preprocessing
  • 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.

    491 files changed

    +18449
    -8770
    lines changed

    ‎.binder/requirements.txt

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -7,3 +7,4 @@ seaborn
    77
    Pillow
    88
    sphinx-gallery
    99
    scikit-learn
    10+
    polars

    ‎.circleci/config.yml

    Lines changed: 7 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -24,8 +24,10 @@ jobs:
    2424
    - OPENBLAS_NUM_THREADS: 2
    2525
    - CONDA_ENV_NAME: testenv
    2626
    - LOCK_FILE: build_tools/circle/doc_min_dependencies_linux-64_conda.lock
    27-
    # Do not fail if the documentation build generates warnings
    28-
    - SKLEARN_DOC_BUILD_WARNINGS_AS_ERRORS: 'false'
    27+
    # Do not fail if the documentation build generates warnings with minimum
    28+
    # dependencies as long as we can avoid raising warnings with more recent
    29+
    # versions of the same dependencies.
    30+
    - SKLEARN_WARNINGS_AS_ERRORS: '0'
    2931
    steps:
    3032
    - checkout
    3133
    - run: ./build_tools/circle/checkout_merge_commit.sh
    @@ -60,8 +62,9 @@ jobs:
    6062
    - OPENBLAS_NUM_THREADS: 2
    6163
    - CONDA_ENV_NAME: testenv
    6264
    - LOCK_FILE: build_tools/circle/doc_linux-64_conda.lock
    63-
    # Make sure that we fail if the documentation build generates warnings
    64-
    - SKLEARN_DOC_BUILD_WARNINGS_AS_ERRORS: 'true'
    65+
    # Make sure that we fail if the documentation build generates warnings with
    66+
    # recent versions of the dependencies.
    67+
    - SKLEARN_WARNINGS_AS_ERRORS: '1'
    6568
    steps:
    6669
    - checkout
    6770
    - run: ./build_tools/circle/checkout_merge_commit.sh

    ‎.github/ISSUE_TEMPLATE/config.yml

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -9,9 +9,9 @@ contact_links:
    99
    - name: Mailing list
    1010
    url: https://mail.python.org/mailman/listinfo/scikit-learn
    1111
    about: General discussions and announcements on the mailing list
    12-
    - name: Gitter
    13-
    url: https://gitter.im/scikit-learn/scikit-learn
    14-
    about: Users and developers can sometimes be found on the gitter channel
    12+
    - name: Discord server
    13+
    url: https://discord.gg/h9qyrK8Jc8
    14+
    about: Developers and users can be found on the Discord server
    1515
    - name: Blank issue
    1616
    url: https://github.com/scikit-learn/scikit-learn/issues/new
    17-
    about: Please note that Github Discussions should be used in most cases instead
    17+
    about: Please note that GitHub Discussions should be used in most cases instead

    ‎.github/PULL_REQUEST_TEMPLATE.md

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -26,7 +26,7 @@ review, either the pull request needs some benchmarking, tinkering,
    2626
    convincing, etc. or more likely the reviewers are simply busy. In either
    2727
    case, we ask for your understanding during the review process.
    2828
    For more information, see our FAQ on this topic:
    29-
    http://scikit-learn.org/dev/faq.html#why-is-my-pull-request-not-getting-any-attention.
    29+
    https://scikit-learn.org/dev/faq.html#why-is-my-pull-request-not-getting-any-attention.
    3030
    3131
    Thanks for contributing!
    3232
    -->

    ‎.github/workflows/check-manifest.yml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -12,7 +12,7 @@ jobs:
    1212
    runs-on: ubuntu-latest
    1313
    steps:
    1414
    - uses: actions/checkout@v3
    15-
    - uses: actions/setup-python@v4
    15+
    - uses: actions/setup-python@v5
    1616
    with:
    1717
    python-version: '3.9'
    1818
    - name: Install dependencies

    ‎.github/workflows/codeql.yml

    Lines changed: 73 additions & 0 deletions
    +
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,73 @@
    1+
    name: "CodeQL"
    2+
    3+
    on:
    4+
    push:
    5+
    branches: [ "main", "*.X" ]
    6+
    pull_request:
    7+
    branches: [ "main", "*.X" ]
    8+
    schedule:
    9+
    - cron: '0 6 * * 1'
    10
    11+
    jobs:
    12+
    analyze:
    13+
    name: Analyze
    14+
    # Runner size impacts CodeQL analysis time. To learn more, please see:
    15+
    # - https://gh.io/recommended-hardware-resources-for-running-codeql
    16+
    # - https://gh.io/supported-runners-and-hardware-resources
    17+
    # - https://gh.io/using-larger-runners
    18+
    # Consider using larger runners for possible analysis time improvements.
    19+
    runs-on: 'ubuntu-latest'
    20+
    timeout-minutes: 360
    21+
    permissions:
    22+
    # required for all workflows
    23+
    security-events: write
    24+
    25+
    # only required for workflows in private repositories
    26+
    actions: read
    27+
    contents: read
    28+
    29+
    strategy:
    30+
    fail-fast: false
    31+
    matrix:
    32+
    language: [ 'javascript-typescript', 'python' ]
    33+
    # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
    34+
    # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
    35+
    # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
    36+
    # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
    37+
    38+
    steps:
    39+
    - name: Checkout repository
    40+
    uses: actions/checkout@v4
    41+
    42+
    # Initializes the CodeQL tools for scanning.
    43+
    - name: Initialize CodeQL
    44+
    uses: github/codeql-action/init@v3
    45+
    with:
    46+
    languages: ${{ matrix.language }}
    47+
    # If you wish to specify custom queries, you can do so here or in a config file.
    48+
    # By default, queries listed here will override any specified in a config file.
    49+
    # Prefix the list here with "+" to use these queries and those in the config file.
    50+
    51+
    # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
    52+
    # queries: security-extended,security-and-quality
    53+
    54+ 10000
    55+
    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
    56+
    # If this step fails, then you should remove it and run the build manually (see below)
    57+
    - name: Autobuild
    58+
    uses: github/codeql-action/autobuild@v3
    59+
    60+
    # ℹ️ Command-line programs to run using the OS shell.
    61+
    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
    62+
    63+
    # If the Autobuild fails above, remove it and uncomment the following three lines.
    64+
    # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
    65+
    66+
    # - run: |
    67+
    # echo "Run, Build Application using script"
    68+
    # ./location_of_script_within_repo/buildscript.sh
    69+
    70+
    - name: Perform CodeQL Analysis
    71+
    uses: github/codeql-action/analyze@v3
    72+
    with:
    73+
    category: "/language:${{matrix.language}}"

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

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -16,7 +16,7 @@ jobs:
    1616
    runs-on: ubuntu-20.04
    1717
    steps:
    1818
    - uses: actions/checkout@v3
    19-
    - uses: actions/setup-python@v4
    19+
    - uses: actions/setup-python@v5
    2020
    with:
    2121
    python-version: '3.9'
    2222
    - name: Install PyGithub

    ‎.github/workflows/lint.yml

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -25,7 +25,7 @@ jobs:
    2525
    ref: ${{ github.event.pull_request.head.sha }}
    2626

    2727
    - name: Set up Python
    28-
    uses: actions/setup-python@v3
    28+
    uses: actions/setup-python@v5
    2929
    with:
    3030
    python-version: 3.11
    3131

    @@ -75,7 +75,7 @@ jobs:
    7575
    uses: actions/checkout@v3
    7676

    7777
    - name: Set up Python
    78-
    uses: actions/setup-python@v3
    78+
    uses: actions/setup-python@v5
    7979
    with:
    8080
    python-version: 3.11
    8181

    ‎.github/workflows/publish_pypi.yml

    Lines changed: 2 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -13,12 +13,13 @@ on:
    1313
    jobs:
    1414
    publish:
    1515
    runs-on: ubuntu-latest
    16+
    environment: publish_pypi
    1617
    permissions:
    1718
    # IMPORTANT: this permission is mandatory for trusted publishing
    1819
    id-token: write
    1920
    steps:
    2021
    - uses: actions/checkout@v3
    21-
    - uses: actions/setup-python@v4
    22+
    - uses: actions/setup-python@v5
    2223
    with:
    2324
    python-version: '3.8'
    2425
    - name: Install dependencies

    ‎.github/workflows/update-lock-files.yml

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -17,16 +17,16 @@ jobs:
    1717
    matrix:
    1818
    include:
    1919
    - name: main
    20-
    update_script_args: "--skip-build 'scipy-dev|^pymin_conda_forge$|pypy'"
    20+
    update_script_args: "--select-tag main-ci"
    2121
    additional_commit_message: "[doc build]"
    2222
    - name: scipy-dev
    23-
    update_script_args: "--select-build scipy_dev"
    23+
    update_script_args: "--select-tag scipy-dev"
    2424
    additional_commit_message: "[scipy-dev]"
    25< 6DC8 /code>25
    - name: cirrus-arm
    26-
    update_script_args: "--select-build '^pymin_conda_forge$'"
    26+
    update_script_args: "--select-tag arm"
    2727
    additional_commit_message: "[cirrus arm]"
    2828
    - name: pypy
    29-
    update_script_args: "--select-build pypy"
    29+
    update_script_args: "--select-tag pypy"
    3030
    additional_commit_message: "[pypy]"
    3131

    3232
    steps:

    0 commit comments

    Comments
     (0)
    0