Skip to content

Commit 83805fe

Browse files
authored
Merge branch 'main' into gh20048
2 parents 1dcca8b + 4d2f88a commit 83805fe

File tree

580 files changed

+49669
-24182
lines changed

Some content is hidden

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

580 files changed

+49669
-24182
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
no_output_timeout: 25m
117117
command: |
118118
export PYTHONPATH=$PWD/build-install/lib/python3.11/site-packages
119-
python dev.py --no-build doc 2>&1 | tee sphinx_log.txt
119+
python dev.py --no-build doc -j2 2>&1 | tee sphinx_log.txt
120120
121121
- run:
122122
name: Check sphinx log for warnings (which are treated as errors)

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<!--
22
Thanks for contributing a pull request! Please ensure that
33
your PR satisfies the checklist before submitting:
4-
http://scipy.github.io/devdocs/dev/contributor/development_workflow.html#checklist-before-submitting-a-pr
4+
https://scipy.github.io/devdocs/dev/contributor/development_workflow.html#checklist-before-submitting-a-pr
55
66
Also, please name and describe your PR as you would write a
77
commit message:
8-
http://scipy.github.io/devdocs/dev/contributor/development_workflow.html#writing-the-commit-message.
8+
https://scipy.github.io/devdocs/dev/contributor/development_workflow.html#writing-the-commit-message.
99
However, please only include an issue number in the description, not the title,
1010
and please ensure that any code names containing underscores are enclosed in backticks.
1111
1212
Depending on your changes, you can skip CI operations and save time and energy:
13-
http://scipy.github.io/devdocs/dev/contributor/continuous_integration.html#skipping
13+
https://scipy.github.io/devdocs/dev/contributor/continuous_integration.html#skipping
1414
1515
Note that we are a team of volunteers; we appreciate your
1616
patience during the review process.

.github/workflows/array_api.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@ env:
1919
-t scipy.cluster
2020
-t scipy.constants
2121
-t scipy.fft
22+
-t scipy.special.tests.test_logsumexp
2223
-t scipy.special.tests.test_support_alternative_backends
2324
-t scipy._lib.tests.test_array_api
2425
-t scipy._lib.tests.test__util
2526
-t scipy.differentiate.tests.test_differentiate
2627
-t scipy.integrate.tests.test_tanhsinh
28+
-t scipy.integrate.tests.test_cubature
2729
-t scipy.optimize.tests.test_chandrupatla
30+
-t scipy.optimize.tests.test_optimize
2831
-t scipy.stats
2932
-t scipy.ndimage
3033
@@ -53,12 +56,12 @@ jobs:
5356
- maintenance-branch: true
5457

5558
steps:
56-
- uses: actions/[email protected].1
59+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
5760
with:
5861
submodules: recursive
5962

6063
- name: Setup Python
61-
uses: actions/setup-python@v5
64+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
6265
with:
6366
python-version: ${{ matrix.python-version }}
6467
cache: 'pip' # not using a path to also cache pytorch
@@ -70,11 +73,11 @@ jobs:
7073
7174
- name: Install Python packages
7275
run: |
73-
python -m pip install numpy cython pytest pytest-xdist pytest-timeout pybind11 mpmath gmpy2 pythran ninja meson click rich-click doit pydevtool pooch hypothesis array-api-strict
76+
python -m pip install numpy cython pytest pytest-xdist pytest-timeout pybind11 mpmath gmpy2 pythran ninja meson click rich-click doit pydevtool pooch hypothesis array-api-strict==2.1.0
7477
7578
- name: Install PyTorch CPU
7679
run: |
77-
python -m pip install "torch==2.3" --index-url https://download.pytorch.org/whl/cpu
80+
python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
7881
7982
- name: Install JAX
8083
run: |
@@ -90,7 +93,7 @@ jobs:
9093
echo "timestamp=${NOW}" >> $GITHUB_OUTPUT
9194
9295
- name: Setup compiler cache
93-
uses: actions/cache@v4
96+
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
9497
id: cache-ccache
9598
with:
9699
path: ${{ steps.prep-ccache.outputs.dir }}

.github/workflows/circle_artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Run CircleCI artifacts redirector
1111
steps:
1212
- name: GitHub Action step
13-
uses: larsoner/circleci-artifacts-redirector-action@master
13+
uses: scientific-python/circleci-artifacts-redirector-action@4e13a10d89177f4bfc8007a7064bdbeda848d8d1 # v1.0.0
1414
with:
1515
repo-token: ${{ secrets.GITHUB_TOKEN }}
1616
api-token: ${{ secrets.CIRCLE_TOKEN }}

.github/workflows/commit_message.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
message: ${{ steps.skip_check.outputs.message }}
1919
steps:
2020
- name: Checkout scipy
21-
uses: actions/[email protected].1
21+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2222
# Gets the correct commit message for pull request
2323
with:
2424
ref: ${{ github.event.pull_request.head.sha }}

.github/workflows/free_threaded_wheels.yml

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

.github/workflows/issue-labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
# label based on issue title
16-
- uses: github/[email protected]
16+
- uses: github/issue-labeler@c1b0f9f52a63158c4adc09425e858e87b32e9685 # v3.4
1717
if: github.repository == 'scipy/scipy'
1818
with:
1919
configuration-path: .github/labeler.yml

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
python-version: ['3.11']
2828

2929
steps:
30-
- uses: actions/[email protected].1
30+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3131
with:
32-
fetch-depth: 0
32+
fetch-depth: 0 # previous commits used in tools/lint.py
3333
submodules: recursive
3434

3535
- name: Setup Python
36-
uses: actions/setup-python@v5
36+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
3737
with:
3838
python-version: ${{ matrix.python-version }}
3939

0 commit comments

Comments
 (0)