8000 Merge branch 'main' of https://github.com/ivanpan0626/scikit-learn · scikit-learn/scikit-learn@bae9dc2 · GitHub
[go: up one dir, main page]
Skip to content

Commit bae9dc2

Browse files
ivanpan0626ivanpan0626
committed
2 parents dedca0e + fb5eff0 commit bae9dc2
  • sklearn

    • Some content is hidden

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

    186 files changed

    +4858
    -2926
    lines changed

    ‎.github/workflows/publish_pypi.yml

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -39,13 +39,13 @@ jobs:
    3939
    run: |
    4040
    python build_tools/github/check_wheels.py
    4141
    - name: Publish package to TestPyPI
    42-
    uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9.0
    42+
    uses: pypa/gh-action-pypi-publish@8a08d616893759ef8e1aa1f2785787c0b97e20d6 # v1.10.0
    4343
    with:
    4444
    repository-url: https://test.pypi.org/legacy/
    4545
    print-hash: true
    4646
    if: ${{ github.event.inputs.pypi_repo == 'testpypi' }}
    4747
    - name: Publish package to PyPI
    48-
    uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9.0
    48+
    uses: pypa/gh-action-pypi-publish@8a08d616893759ef8e1aa1f2785787c0b97e20d6 # v1.10.0
    4949
    if: ${{ github.event.inputs.pypi_repo == 'pypi' }}
    5050
    with:
    5151
    print-hash: true

    ‎azure-pipelines.yml

    Lines changed: 8 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -40,6 +40,11 @@ jobs:
    4040
    - bash: |
    4141
    ./build_tools/linting.sh
    4242
    displayName: Run linters
    43+
    - bash: |
    44+
    pip install ninja meson scipy
    45+
    python build_tools/check-meson-openmp-dependencies.py
    46+
    displayName: Run Meson OpenMP checks
    47+
    4348
    4449
    - template: build_tools/azure/posix.yml
    4550
    parameters:
    @@ -236,11 +241,11 @@ jobs:
    236241
    not(contains(dependencies['git_commit']['outputs']['commit.message'], '[ci skip]'))
    237242
    )
    238243
    matrix:
    239-
    debian_atlas_32bit:
    240-
    DOCKER_CONTAINER: 'i386/debian:12'
    244+
    debian_32bit:
    245+
    DOCKER_CONTAINER: 'i386/debian:trixie'
    241246
    DISTRIB: 'debian-32'
    242247
    COVERAGE: "true"
    243-
    LOCK_FILE: './build_tools/azure/debian_atlas_32bit_lock.txt'
    248+
    LOCK_FILE: './build_tools/azure/debian_32bit_lock.txt'
    244249
    # disable pytest xdist due to unknown bug with 32-bit container
    245250
    PYTEST_XDIST_VERSION: 'none'
    246251
    SKLEARN_TESTS_GLOBAL_RANDOM_SEED: '4' # non-default seed

    ‎build_tools/azure/debian_32bit_lock.txt

    Lines changed: 37 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,37 @@
    1+
    #
    2+
    # This file is autogenerated by pip-compile with Python 3.12
    3+
    # by the following command:
    4+
    #
    5+
    # pip-compile --output-file=build_tools/azure/debian_32bit_lock.txt build_tools/azure/debian_32bit_requirements.txt
    6+
    #
    7+
    coverage[toml]==7.6.1
    8+
    # via pytest-cov
    9+
    cython==3.0.11
    10+
    # via -r build_tools/azure/debian_32bit_requirements.txt
    11+
    iniconfig==2.0.0
    12+
    # via pytest
    13+
    joblib==1.4.2
    14+
    # via -r build_tools/azure/debian_32bit_requirements.txt
    15+
    meson==1.5.1
    16+
    # via meson-python
    17+
    meson-python==0.16.0
    18+
    # via -r build_tools/azure/debian_32bit_requirements.txt
    19+
    ninja==1.11.1.1
    20+
    # via -r build_tools/azure/debian_32bit_requirements.txt
    21+
    packaging==24.1
    22+
    # via
    23+
    # meson-python
    24+
    # pyproject-metadata
    25+
    # pytest
    26+
    pluggy==1.5.0
    27+
    # via pytest
    28+
    pyproject-metadata==0.8.0
    29+
    # via meson-python
    30+
    pytest==8.3.2
    31+
    # via
    32+
    # -r build_tools/azure/debian_32bit_requirements.txt
    33+
    # pytest-cov
    34+
    pytest-cov==5.0.0
    35+
    # via -r build_tools/azure/debian_32bit_requirements.txt
    36+
    threadpoolctl==3.5.0
    37+
    # via -r build_tools/azure/debian_32bit_requirements.txt

    ‎build_tools/azure/debian_atlas_32bit_requirements.txt renamed to ‎build_tools/azure/debian_32bit_requirements.txt

    Lines changed: 5 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,10 +1,10 @@
    11
    # DO NOT EDIT: this file is generated from the specification found in the
    22
    # following script to centralize the configuration for CI builds:
    33
    # build_tools/update_environments_and_lock_files.py
    4-
    cython==3.0.10 # min
    5-
    joblib==1.2.0 # min
    6-
    threadpoolctl==3.1.0
    7-
    pytest==7.1.2 # min
    8-
    pytest-cov==2.9.0 # min
    4+
    cython
    5+
    joblib
    6+
    threadpoolctl
    7+
    pytest
    8+
    pytest-cov
    99
    ninja
    1010
    meson-python

    ‎build_tools/azure/debian_atlas_32bit_lock.txt

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

    ‎build_tools/azure/install.sh

    Lines changed: 4 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -24,6 +24,9 @@ setup_ccache() {
    2424
    done
    2525
    export PATH="${CCACHE_LINKS_DIR}:${PATH}"
    2626
    ccache -M 256M
    27+
    28+
    # Zeroing statistics so that ccache statistics are shown only for this build
    29+
    ccache -z
    2730
    fi
    2831
    }
    2932

    @@ -36,7 +39,7 @@ pre_python_environment_install() {
    3639
    elif [[ "$DISTRIB" == "debian-32" ]]; then
    3740
    apt-get update
    3841
    apt-get install -y python3-dev python3-numpy python3-scipy \
    39-
    python3-matplotlib libatlas3-base libatlas-base-dev \
    42+
    python3-matplotlib libopenblas-dev \
    4043
    python3-virtualenv python3-pandas ccache git
    4144

    4245
    # TODO for now we use CPython 3.13 from Ubuntu deadsnakes PPA. When CPython

    0 commit comments

    Comments
     (0)
    0