10000 Merge branch 'glm_newton_cholesky' into glm_newton_lsmr · scikit-learn/scikit-learn@9de52bf · GitHub
[go: up one dir, main page]
Skip to content

Commit 9de52bf

Browse files
lorentzenchrlorentzenchr
committed
Merge branch 'glm_newton_cholesky' into glm_newton_lsmr
2 parents 55f456f + d8c98a2 commit 9de52bf

File tree

231 files changed

+10435
-6419
lines changed

Some content is hidden

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

231 files changed

+10435
-6419
lines changed

‎.github/workflows/build-docs.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,17 @@ on:
1515
jobs:
1616
# Build the documentation against the minimum version of the dependencies
1717
doc-min-dependencies:
18+
# This prevents this workflow from running on a fork.
19+
# To test this workflow on a fork, uncomment the following line.
20+
if: github.repository == 'scikit-learn/scikit-learn'
21+
1822
runs-on: ubuntu-latest
1923
steps:
2024
- name: Checkout scikit-learn
2125
uses: actions/checkout@v2
2226
with:
27+
# needed by build_doc.sh to compute the list of changed doc files:
28+
fetch-depth: 0
2329
ref: ${{ github.event.pull_request.head.sha }}
2430

2531
- name: Setup Python
@@ -41,11 +47,17 @@ jobs:
4147

4248
# Build the documentation against the latest version of the dependencies
4349
doc:
50+
# This prevents this workflow from running on a fork.
51+
# To test this workflow on a fork, uncomment the following line.
52+
if: github.repository == 'scikit-learn/scikit-learn'
53+
4454
runs-on: ubuntu-latest
4555
steps:
4656
- name: Checkout scikit-learn
4757
uses: actions/checkout@v2
4858
with:
59+
# needed by build_doc.sh to compute the list of changed doc files:
60+
fetch-depth: 0
4961
ref: ${{ github.event.pull_request.head.sha }}
5062

5163
- name: Setup Python

‎.github/workflows/trigger-hosting.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ jobs:
1111
push:
1212
runs-on: ubuntu-latest
1313
# Run the job only if the "Documentation builder" workflow succeeded
14-
if: ${{ github.event.workflow_run.conclusion == 'success' }}
14+
# Prevents this workflow from running on a fork.
15+
# To test this workflow on a fork remove the `github.repository == scikit-learn/scikit-learn` condition
16+
if: github.repository == 'scikit-learn/scikit-learn' && github.event.workflow_run.conclusion == 'success'
1517
steps:
1618
- name: Checkout scikit-learn
1719
uses: actions/checkout@v2
@@ -23,4 +25,6 @@ jobs:
2325
EVENT: ${{ github.event.workflow_run.event }}
2426
RUN_ID: ${{ github.event.workflow_run.id }}
2527
HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }}
26-
PULL_REQUEST_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
28+
COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
29+
REPO_NAME: ${{ github.event.workflow_run.head_repository.full_name }}
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repos:
1515
- id: flake8
1616
types: [file, python]
1717
- repo: https://github.com/pre-commit/mirrors-mypy
18-
rev: v0.782
18+
rev: v0.961
1919
hooks:
2020
- id: mypy
2121
files: sklearn/

‎README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ Communication
184184

185185
- Mailing list: https://mail.python.org/mailman/listinfo/scikit-learn
186186
- Gitter: https://gitter.im/scikit-learn/scikit-learn
187+
- Logos & Branding: https://github.com/scikit-learn/scikit-learn/tree/main/doc/logos
187188
- Blog: https://blog.scikit-learn.org
188189
- Calendar: https://blog.scikit-learn.org/calendar/
189190
- Twitter: https://twitter.com/scikit_learn

‎azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
versionSpec: '3.9'
3535
- bash: |
3636
# Include pytest compatibility with mypy
37-
pip install pytest flake8 mypy==0.782 black==22.3.0
37+
pip install pytest flake8 mypy==0.961 black==22.3.0
3838
displayName: Install linters
3939
- bash: |
4040
black --check --diff .

‎build_tools/azure/debian_atlas_32bit_lock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ attrs==21.4.0
1010
# via pytest
1111
cython==0.29.30
1212
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt
13-
importlib-metadata==4.11.4
13+
importlib-metadata==4.12.0
1414
# via pytest
1515
joblib==1.0.0
1616
# via -r build_tools/azure/debian_atlas_32bit_requirements.txt

‎build_tools/azure/py38_conda_defaults_openblas_linux-64_conda.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ https://repo.anaconda.com/pkgs/main/linux-64/blas-1.0-openblas.conda#9ddfcaef10d
77
https://repo.anaconda.com/pkgs/main/linux-64/ca-certificates-2022.4.26-h06a4308_0.conda#fc9c0bf2e7893f5407ff74289dbcf295
88
https://repo.anaconda.com/pkgs/main/linux-64/ld_impl_linux-64-2.38-h1181459_1.conda#68eedfd9c06f2b0e6888d8db345b7f5b
99
https://repo.anaconda.com/pkgs/main/linux-64/libgfortran4-7.5.0-ha8ba4b0_17.conda#e3883581cbf0a98672250c3e80d292bf
10-
https://repo.anaconda.com/pkgs/main/linux-64/libstdcxx-ng-11.2.0-h1234567_0.conda#ce541c2473bd2d56da84ec8f241a8574
10+
https://repo.anaconda.com/pkgs/main/linux-64/libstdcxx-ng-11.2.0-h1234567_1.conda#57623d10a70e09e1d048c2b2b6f4e2dd
1111
https://repo.anaconda.com/pkgs/main/linux-64/libgfortran-ng-7.5.0-ha8ba4b0_17.conda#ecb35c8952579d5c8dc56c6e076ba948
12-
https://repo.anaconda.com/pkgs/main/linux-64/libgomp-11.2.0-h1234567_0.conda#c8acb8d9aff1ead1b273ace299ca12d2
12+
https://repo.anaconda.com/pkgs/main/linux-64/libgomp-11.2.0-h1234567_1.conda#b372c0eea9b60732fdae4b817a63c8cd
1313
https://repo.anaconda.com/pkgs/main/linux-64/_openmp_mutex-5.1-1_gnu.conda#71d281e9c2192cb3fa425655a8defb85
14-
https://repo.anaconda.com/pkgs/main/linux-64/libgcc-ng-11.2.0-h1234567_0.conda#83c045906d7d785252a34846348d16c6
14+
https://repo.anaconda.com/pkgs/main/linux-64/libgcc-ng-11.2.0-h1234567_1.conda#a87728dabf3151fb9cfa990bd2eb0464
1515
https://repo.anaconda.com/pkgs/main/linux-64/expat-2.4.4-h295c915_0.conda#f9930c60940181cf06d0bd0b8095063c
1616
https://repo.anaconda.com/pkgs/main/linux-64/giflib-5.2.1-h7b6447c_0.conda#c2583ad8de5051f19479580c58336f15
1717
https://repo.anaconda.com/pkgs/main/linux-64/icu-58.2-he6710b0_3.conda#48cc14d5ad1a9bcd8dac17211a8deb8b
@@ -30,22 +30,22 @@ https://repo.anaconda.com/pkgs/main/linux-64/zlib-1.2.12-h7f8727e_2.conda#4f4080
3030
https://repo.anaconda.com/pkgs/main/linux-64/ccache-3.7.9-hfe4627d_0.conda#bef6fc681c273bb7bd0c67d1a591365e
3131
https://repo.anaconda.com/pkgs/main/linux-64/glib-2.69.1-h4ff587b_1.conda#4c3eae7c0b8b1c8fb3046a0740313bbf
3232
https://repo.anaconda.com/pkgs/main/linux-64/libpng-1.6.37-hbc83047_0.conda#689f903925dcf6c5ab7bc1de0f58b67b
33-
https://repo.anaconda.com/pkgs/main/linux-64/libxml2-2.9.12-h74e7548_2.conda#eff5ba91c84a8329c2a1117bee13cd68
33+
https://repo.anaconda.com/pkgs/main/linux-64/libxml2-2.9.14-h74e7548_0.conda#2eafeb1cb5f00b034d150f3d70436e52
3434
https://repo.anaconda.com/pkgs/main/linux-64/readline-8.1.2-h7f8727e_1.conda#ea33f478fea12406f394944e7e4f3d20
35-
https://repo.anaconda.com/pkgs/main/linux-64/tk-8.6.11-h1ccaba5_1.conda#5d7d7abe559370a7a8519177929dd338
35+
https://repo.anaconda.com/pkgs/main/linux-64/tk-8.6.12-h1ccaba5_0.conda#fa10ff4aa631fa4aa090a6234d7770b9
3636
https://repo.anaconda.com/pkgs/main/linux-64/zstd-1.5.2-ha4553b6_0.conda#0e926a5f2e02fe4a9376ece4b732ce36
3737
https://repo.anaconda.com/pkgs/main/linux-64/dbus-1.13.18-hb2f20db_0.conda#6a6a6f1391f807847404344489ef6cf4
3838
https://repo.anaconda.com/pkgs/main/linux-64/freetype-2.11.0-h70c0345_0.conda#b767874a6273e1058027cb2e300d00ac
3939
https://repo.anaconda.com/pkgs/main/linux-64/gstreamer-1.14.0-h28cd5cc_2.conda#6af5d0cbd7310e1cd8a6a5c1c99649b2
4040
https://repo.anaconda.com/pkgs/main/linux-64/libtiff-4.2.0-h2818925_1.conda#4197d70794ffb5386cf9d4b59233c481
41-
https://repo.anaconda.com/pkgs/main/linux-64/sqlite-3.38.3-hc218d9a_0.conda#94e50b233f796aa4e0b7cf38611c0852
41+
https://repo.anaconda.com/pkgs/main/linux-64/sqlite-3.38.5-hc218d9a_0.conda#ed2668e84d5e2730827ad737bc5231a3
4242
https://repo.anaconda.com/pkgs/main/linux-64/fontconfig-2.13.1-h6c09931_0.conda#fa04e89166d4b44326c6d76e2f708715
4343
https://repo.anaconda.com/pkgs/main/linux-64/gst-plugins-base-1.14.0-h8213a91_2.conda#838648422452405b86699e780e293c1d
4444
https://repo.anaconda.com/pkgs/main/linux-64/lcms2-2.12-h3be6417_0.conda#719db47afba9f6586eecb5eacac70bff
4545
https://repo.anaconda.com/pkgs/main/linux-64/libwebp-1.2.2-h55f646e_0.conda#c9ed6bddefc09dbfc246301c3ce3ca14
4646
https://repo.anaconda.com/pkgs/main/linux-64/python-3.8.13-h12debd9_0.conda#edc17980bae484b711e090f0a0cbbaef
4747
https://repo.anaconda.com/pkgs/main/noarch/attrs-21.4.0-pyhd3eb1b0_0.conda#3bc977a57587a7964921e3e1e2e31f9e
48-
https://repo.anaconda.com/pkgs/main/linux-64/certifi-2022.5.18.1-py38h06a4308_0.conda#dee2837b4ce535119636eb15ab312fd2
48+
https://repo.anaconda.com/pkgs/main/linux-64/certifi-2022.6.15-py38h06a4308_0.conda#ebd13bbcc4bd93d8e743be775cc9b865
4949
https://repo.anaconda.com/pkgs/main/noarch/charset-normalizer-2.0.4-pyhd3eb1b0_0.conda#e7a441d94234b2b5fafee06e25dbf076
5050
https://repo.anaconda.com/pkgs/main/linux-64/coverage-6.2-py38h7f8727e_0.conda#34a3006ca7d8d286b63593b31b845ace
5151
https://repo.anaconda.com/pkgs/main/noarch/cycler-0.11.0-pyhd3eb1b0_0.conda#f5e365d2cdb66d547eb8c3ab93843aab
@@ -62,7 +62,7 @@ https://repo.anaconda.com/pkgs/main/noarch/py-1.11.0-pyhd3eb1b0_0.conda#7205a898
6262
https://repo.anaconda.com/pkgs/main/noarch/pycparser-2.21-pyhd3eb1b0_0.conda#135a72ff2a31150a3a3ff0b1edd41ca9
6363
https://repo.anaconda.com/pkgs/main/noarch/pyparsing-3.0.4-pyhd3eb1b0_0.conda#6bca2ae9c9aae9ccdebcb8cf2aa87cb3
6464
https://repo.anaconda.com/pkgs/main/linux-64/pysocks-1.7.1-py38h06a4308_0.conda#21c67581f3a81ffbb02728eb2178d693
65-
https://repo.anaconda.com/pkgs/main/noarch/pytz-2021.3-pyhd3eb1b0_0.conda#76415b791ffd2007687ac5f0665aa7af
65+
https://repo.anaconda.com/pkgs/main/linux-64/pytz-2022.1-py38h06a4308_0.conda#d9e022584b586338e235e41a76ccc657
6666
https://repo.anaconda.com/pkgs/main/linux-64/qt-5.9.7-h5867ecd_1.conda#05507dbc35c46ac5a7066fc860a62341
6767
https://repo.anaconda.com/pkgs/main/linux-64/sip-4.19.13-py38h295c915_0.conda#2046e66b7d12f7c0cda5687e4c27b692
6868
https://repo.anaconda.com/pkgs/main/noarch/six-1.16.0-pyhd3eb1b0_1.conda#34586824d411d36af2fa40e799c172d0
@@ -80,7 +80,7 @@ https://repo.anaconda.com/pkgs/main/linux-64/brotlipy-0.7.0-py38h27cfd23_1003.co
8080
https://repo.anaconda.com/pkgs/main/linux-64/cryptography-37.0.1-py38h9ce1e76_0.conda#16d301ed789096eb9881a25ed7a1155e
8181
https://repo.anaconda.com/pkgs/main/linux-64/matplotlib-base-3.1.2-py38hef1b27d_1.conda#5e99f974f4c2757791aa10a27596230a
8282
https://repo.anaconda.com/pkgs/main/linux-64/pandas-1.2.4-py38ha9443f7_0.conda#5bd3fd807a294f387feabc65821b75d0
83-
https://repo.anaconda.com/pkgs/main/linux-64/pytest-7.1.1-py38h06a4308_0.conda#630c0a0aff5f50ea71e2bf33389e1d5c
83+
https://repo.anaconda.com/pkgs/main/linux-64/pytest-7.1.2-py38h06a4308_0.conda#8d7f526a3d29273e06957d302f515755
8484
https://repo.anaconda.com/pkgs/main/linux-64/scipy-1.3.2-py38he2b7bc3_0.conda#a9df91d5a41c1f39524fc8a53c56bc29
8585
https://repo.anaconda.com/pkgs/main/linux-64/matplotlib-3.1.2-py38_1.conda#1781036a02c5def820ea2923074d158a
8686
https://repo.anaconda.com/pkgs/main/linux-64/pyamg-4.1.0-py38h9a67853_0.conda#9b0bffd5f67e0c5ee3c226e5518991fb

0 commit comments

Comments
 (0)
0