Skip to content

Commit adea993

Browse files
ndgrigorianndgrigorian
authored
Merge branch 'master' into permit-build-python-3.13
2 parents adf9a35 + 05232e0 commit adea993

39 files changed

+2775
-2908
lines changed

‎.github/workflows/build-with-clang.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Cancel Previous Runs
28-
uses: styfle/cancel-workflow-action@0.12.1
28+
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
2929
with:
3030
access_token: ${{ github.token }}
3131

@@ -44,13 +44,13 @@ jobs:
4444
sudo apt-get install intel-oneapi-mkl-devel
4545
4646
- name: Setup Python
47-
uses: actions/setup-python@v5
47+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
4848
with:
4949
python-version: ${{ matrix.python }}
5050
architecture: x64
5151

5252
- name: Checkout repo
53-
uses: actions/checkout@v4
53+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5454
with:
5555
fetch-depth: 0
5656

‎.github/workflows/build_pip.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
run: |
3232
sudo apt-get install jq
3333
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3535
with:
3636
fetch-depth: 0
3737

38-
- uses: conda-incubator/setup-miniconda@v3
38+
- uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
3939
with:
4040
use-mamba: true
4141
miniforge-version: latest

‎.github/workflows/conda-package-cf.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
python: ['3.9', '3.10', '3.11', '3.12']
2424
steps:
2525
- name: Cancel Previous Runs
26-
uses: styfle/cancel-workflow-action@0.12.1
26+
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
2727
with:
2828
access_token: ${{ github.token }}
2929

30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3131
with:
3232
fetch-depth: 0
3333

@@ -36,7 +36,7 @@ jobs:
3636
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
3737
3838
- name: Cache conda packages
39-
uses: actions/cache@v4
39+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
4040
env:
4141
CACHE_NUMBER: 0 # Increase to reset cache
4242
with:
@@ -51,7 +51,7 @@ jobs:
5151
run: echo $CONDA/bin >> $GITHUB_PATH
5252

5353
- name: Install conda-build
54-
run: conda install conda-build
54+
run: conda install conda-build python=3.12
5555

5656
- name: Build conda package with NumPy 2.0
5757
run: |
@@ -66,7 +66,7 @@ jobs:
6666
conda-recipe-cf
6767
6868
- name: Upload artifact
69-
uses: actions/upload-artifact@v4
69+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7070
with:
7171
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
7272
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
@@ -87,15 +87,15 @@ jobs:
8787

8888
steps:
8989
- name: Download artifact
90-
uses: actions/download-artifact@v4
90+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
9191
with:
9292
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_ver }}
9393

9494
- name: Add conda to system path
9595
run: echo $CONDA/bin >> $GITHUB_PATH
9696

9797
- name: Install conda-build
98-
run: conda install conda-build
98+
run: conda install conda-build python=3.12
9999

100100
- name: Create conda channel
101101
run: |
@@ -118,7 +118,7 @@ jobs:
118118
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
119119
120120
- name: Cache conda packages
121-
uses: actions/cache@v4
121+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
122122
env:
123123
CACHE_NUMBER: 0 # Increase to reset cache
124124
with:
@@ -150,15 +150,15 @@ jobs:
150150
python: ['3.9', '3.10', '3.11', '3.12']
151151
steps:
152152
- name: Cancel Previous Runs
153-
uses: styfle/cancel-workflow-action@0.12.1
153+
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
154154
with:
155155
access_token: ${{ github.token }}
156156

157-
- uses: actions/checkout@v4
157+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
158158
with:
159159
fetch-depth: 0
160160

161-
- uses: conda-incubator/setup-miniconda@v3
161+
- uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
162162
with:
163163
miniforge-version: latest
164164
activate-environment: build
@@ -167,10 +167,10 @@ jobs:
167167
conda-remove-defaults: 'true'
168168

169169
- name: Install conda-build
170-
run: conda install -n base conda-build
170+
run: conda install -n base conda-build python=3.12
171171

172172
- name: Cache conda packages
173-
uses: actions/cache@v4
173+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
174174
env:
175175
CACHE_NUMBER: 3 # Increase to reset cache
176176
with:
@@ -192,7 +192,7 @@ jobs:
192192
echo "CONDA_BLD=$CONDA/conda-bld/win-64/" | tr "\\\\" '/' >> $GITHUB_ENV
193193
194194
- name: Upload artifact
195-
uses: actions/upload-artifact@v4
195+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
196196
with:
197197
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
198198
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
@@ -217,11 +217,11 @@ jobs:
217217

218218
steps:
219219
- name: Download artifact
220-
uses: actions/download-artifact@v4
220+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
221221
with:
222222
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_ver }}
223223

224-
- uses: conda-incubator/setup-miniconda@v3
224+
- uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
225225
with:
226226
miniforge-version: latest
227227
activate-environment: ${{ env.TEST_ENV_NAME }}
@@ -273,7 +273,7 @@ jobs:
273273
run: Get-Content -Path .\lockfile
274274

275275
- name: Cache conda packages
276-
uses: actions/cache@v4
276+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
277277
env:
278278
CACHE_NUMBER: 0 # Increase to reset cache
279279
with:
@@ -295,14 +295,14 @@ jobs:
295295
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
296296
SET PACKAGE_VERSION=%%F
297297
)
298-
SET "TEST_DEPENDENCIES=pytest pytest-cov"
299-
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} ${{ matrix.numpy }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
298+
SET "TEST_DEPENDENCIES=pytest scipy"
299+
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
300300
301301
- name: Report content of test environment
302302
shell: cmd /C CALL {0}
303303
run: |
304-
echo "Value of CONDA enviroment variable was: " %CONDA%
305-
echo "Value of CONDA_PREFIX enviroment variable was: " %CONDA_PREFIX%
304+
echo "Value of CONDA environment variable was: " %CONDA%
305+
echo "Value of CONDA_PREFIX environment variable was: " %CONDA_PREFIX%
306306
conda info && conda list -n ${{ env.TEST_ENV_NAME }}
307307
308308
- name: Run tests

‎.github/workflows/conda-package.yml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
python: ['3.9', '3.10', '3.11', '3.12']
2424
steps:
2525
- name: Cancel Previous Runs
26-
uses: styfle/cancel-workflow-action@0.12.1
26+
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
2727
with:
2828
access_token: ${{ github.token }}
2929

30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3131
with:
3232
fetch-depth: 0
3333

@@ -36,7 +36,7 @@ jobs:
3636
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
3737
3838
- name: Cache conda packages
39-
uses: actions/cache@v4
39+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
4040
env:
4141
CACHE_NUMBER: 0 # Increase to reset cache
4242
with:
@@ -51,7 +51,7 @@ jobs:
5151
run: echo $CONDA/bin >> $GITHUB_PATH
5252

5353
- name: Install conda-build
54-
run: conda install conda-build
54+
run: conda install conda-build python=3.12
5555

5656
- name: Build conda package
5757
run: |
@@ -66,7 +66,7 @@ jobs:
6666
conda-recipe
6767
6868
- name: Upload artifact
69-
uses: actions/upload-artifact@v4
69+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7070
with:
7171
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
7272
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
@@ -86,15 +86,15 @@ jobs:
8686

8787
steps:
8888
- name: Download artifact
89-
uses: actions/download-artifact@v4
89+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
9090
with:
9191
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
9292

9393
- name: Add conda to system path
9494
run: echo $CONDA/bin >> $GITHUB_PATH
9595

9696
- name: Install conda-build
97-
run: conda install conda-build
97+
run: conda install conda-build python=3.12
9898

9999
- name: Create conda channel
100100
run: |
@@ -117,7 +117,7 @@ jobs:
117117
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
118118
119119
- name: Cache conda packages
120-
uses: actions/cache@v4
120+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
121121
env:
122122
CACHE_NUMBER: 0 # Increase to reset cache
123123
with:
@@ -131,7 +131,8 @@ jobs:
131131
- name: Install mkl_fft
132132
run: |
133133
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
134-
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python }} $PACKAGE_NAME pytest scipy $CHANNELS
134+
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python }} "scipy>=1.10" $CHANNELS
135+
conda install -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME pytest $CHANNELS
135136
# Test installed packages
136137
conda list -n ${{ env.TEST_ENV_NAME }}
137138
@@ -149,15 +150,15 @@ jobs:
149150
python: ['3.9', '3.10', '3.11', '3.12']
150151
steps:
151152
- name: Cancel Previous Runs
152-
uses: styfle/cancel-workflow-action@0.12.1
153+
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
153154
with:
154155
access_token: ${{ github.token }}
155156

156-
- uses: actions/checkout@v4.2.0
157+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
157158
with:
158159
fetch-depth: 0
159160

160-
- uses: conda-incubator/setup-miniconda@v3
161+
- uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
161162
with:
162163
miniforge-version: latest
163164
activate-environment: build
@@ -168,10 +169,10 @@ jobs:
168169
- name: Install conda-build
169170
run: |
170171
conda activate
171-
conda install -n base conda-build
172+
conda install -n base conda-build python=3.12
172173
173174
- name: Cache conda packages
174-
uses: actions/cache@v4
175+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
175176
env:
176177
CACHE_NUMBER: 3 # Increase to reset cache
177178
with:
@@ -193,7 +194,7 @@ jobs:
193194
echo "CONDA_BLD=$CONDA/conda-bld/win-64/" | tr "\\\\" '/' >> $GITHUB_ENV
194195
195196
- name: Upload artifact
196-
uses: actions/upload-artifact@v4
197+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
197198
with:
198199
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
199200
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
@@ -217,11 +218,11 @@ jobs:
217218

218219
steps:
219220
- name: Download artifact
220-
uses: actions/download-artifact@v4
221+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
221222
with:
222223
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
223224

224-
- uses: conda-incubator/setup-miniconda@v3
225+
- uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
225226
with:
226227
miniforge-version: latest
227228
activate-environment: ${{ env.TEST_ENV_NAME }}
@@ -273,7 +274,7 @@ jobs:
273274
run: Get-Content -Path .\lockfile
274275

275276
- name: Cache conda packages
276-
uses: actions/cache@v4
277+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
277278
env:
278279
CACHE_NUMBER: 0 # Increase to reset cache
279280
with:
@@ -295,15 +296,16 @@ jobs:
295296
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
296297
SET PACKAGE_VERSION=%%F
297298
)
298-
SET "TEST_DEPENDENCIES=pytest pytest-cov"
299-
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
299+
SET "TEST_DEPENDENCIES=pytest scipy"
300+
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
300301
301302
- name: Report content of test environment
302303
shell: cmd /C CALL {0}
303304
run: |
304-
echo "Value of CONDA enviroment variable was: " %CONDA%
305-
echo "Value of CONDA_PREFIX enviroment variable was: " %CONDA_PREFIX%
305+
echo "Value of CONDA environment variable was: " %CONDA%
306+
echo "Value of CONDA_PREFIX environment variable was: " %CONDA_PREFIX%
306307
conda info && conda list -n ${{ env.TEST_ENV_NAME }}
308+
307309
- name: Run tests
308310
shell: cmd /C CALL {0}
309311
run: >-

‎.github/workflows/openssf-scorecard.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ jobs:
3434

3535
steps:
3636
- name: "Checkout code"
37-
uses: actions/checkout@v4.1.1
37+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3838
with:
3939
persist-credentials: false
4040

4141
- name: "Run analysis"
42-
uses: ossf/scorecard-action@v2.4.1
42+
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
4343
with:
4444
results_file: results.sarif
4545
results_format: sarif
@@ -61,14 +61,14 @@ jobs:
6161
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6262
# format to the repository Actions tab.
6363
- name: "Upload artifact"
64-
uses: actions/upload-artifact@v4.3.0
64+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6565
with:
6666
name: SARIF file
6767
path: results.sarif
6868
retention-days: 14
6969

7070
# Upload the results to GitHub's code scanning dashboard.
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@v3.28.15
72+
uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
7373
with:
7474
sarif_file: results.sarif

0 commit comments

Comments
 (0)