8000 Merge remote-tracking branch 'upstream/main' into less-validation-spa… · jeremiedbb/scikit-learn@fd88b7b · GitHub
[go: up one dir, main page]
Skip to content

Commit fd88b7b

Browse files
jeremiedbbjeremiedbb
committed
Merge remote-tracking branch 'upstream/main' into less-validation-sparse-coding-2
2 parents 9915fc1 + 57bb1ac commit fd88b7b

File tree

74 files changed

+1181
-931
lines changed

Some content is hidden

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

74 files changed

+1181
-931
lines changed

‎.cirrus.star

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ def main(ctx):
3030
return []
3131

3232
if "[cd build]" in commit_msg or "[cd build cirrus]" in commit_msg:
33-
return fs.read(arm_wheel_yaml)
33+
return fs.read(arm_wheel_yaml) + fs.read(arm_tests_yaml)
3434

3535
return fs.read(arm_tests_yaml)

‎.github/workflows/wheels.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,6 @@ jobs:
103103
python: 311
104104
platform_id: macosx_x86_64
105105

106-
# MacOS arm64
107-
- os: macos-latest
108-
python: 38
109-
platform_id: macosx_arm64
110-
- os: macos-latest
111-
python: 39
112-
platform_id: macosx_arm64
113-
- os: macos-latest
114-
python: 310
115-
platform_id: macosx_arm64
116-
- os: macos-latest
117-
python: 311
118-
platform_id: macosx_arm64
119-
120106
steps:
121107
- name: Checkout scikit-learn
122108
uses: actions/checkout@v3
@@ -221,5 +207,6 @@ jobs:
221207
# Secret variables need to be mapped to environment variables explicitly
222208
SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: ${{ secrets.SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN }}
223209
SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: ${{ secrets.SCIKIT_LEARN_STAGING_UPLOAD_TOKEN }}
210+
ARTIFACTS_PATH: dist/artifact
224211
# Force a replacement if the remote file already exists
225212
run: bash build_tools/github/upload_anaconda.sh

‎.travis.yml

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

‎README.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
.. -*- mode: rst -*-
22
3-
|Azure|_ |Travis|_ |CirrusCI|_ |Codecov|_ |CircleCI|_ |Nightly wheels|_ |Black|_ |PythonVersion|_ |PyPi|_ |DOI|_ |Benchmark|_
3+
|Azure|_ |CirrusCI|_ |Codecov|_ |CircleCI|_ |Nightly wheels|_ |Black|_ |PythonVersion|_ |PyPi|_ |DOI|_ |Benchmark|_
44

55
.. |Azure| image:: https://dev.azure.com/scikit-learn/scikit-learn/_apis/build/status/scikit-learn.scikit-learn?branchName=main
66
.. _Azure: https://dev.azure.com/scikit-learn/scikit-learn/_build/latest?definitionId=1&branchName=main
77

88
.. |CircleCI| image:: https://circleci.com/gh/scikit-learn/scikit-learn/tree/main.svg?style=shield&circle-token=:circle-token
99
.. _CircleCI: https://circleci.com/gh/scikit-learn/scikit-learn
1010

11-
.. |Travis| image:: https://api.travis-ci.com/scikit-learn/scikit-learn.svg?branch=main
12-
.. _Travis: https://app.travis-ci.com/github/scikit-learn/scikit-learn
13-
1411
.. |CirrusCI| image:: https://img.shields.io/cirrus/github/scikit-learn/scikit-learn/main?label=Cirrus%20CI
1512
.. _CirrusCI: https://cirrus-ci.com/github/scikit-learn/scikit-learn/main
1613

‎build_tools/circle/doc_environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies:
2121
- seaborn
2222
- memory_profiler
2323
- compilers
24-
- sphinx
24+
- sphinx=6.0.0
2525
- sphinx-gallery
2626
- numpydoc
2727
- sphinx-prompt

0 commit comments

Comments
 (0)
0