Skip to content

Commit 2ac4f94

Browse files
antonwolfyantonwolfy
authored
Merge branch 'master' into align-third-party-tests
2 parents fb93a76 + afa6980 commit 2ac4f94

Some content is hidden

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

49 files changed

+1742
-403
lines changed

‎.github/workflows/build-sphinx.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,21 +104,15 @@ jobs:
104104

105105
# https://github.com/marketplace/actions/setup-miniconda
106106
- name: Setup miniconda
107-
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
107+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
108108
with:
109109
miniforge-version: latest
110-
use-mamba: true
110+
use-mamba: 'true'
111111
channels: conda-forge
112+
conda-remove-defaults: 'true'
112113
python-version: ${{ env.python-ver }}
113114
activate-environment: 'docs'
114115

115-
# Here is an issue in conda gh-12356 causing adding defaults to the list of channels
116-
# upon running `conda config --append channels conda-forge`, while mamba requires to have only conda-forge channel
117-
- name: Remove defaults channel
118-
run: |
119-
conda config --remove channels defaults
120-
conda config --show
121-
122116
# Sometimes `mamba install ...` fails due to slow download speed rate, so disable the check in mamba
123117
- name: Disable speed limit check in mamba
124118
run: echo "MAMBA_NO_LOW_SPEED_LIMIT=1" >> $GITHUB_ENV

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

Lines changed: 18 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,15 @@ jobs:
5656
fetch-depth: 0
5757

5858
- name: Setup miniconda
59-
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
59+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
6060
with:
6161
miniforge-version: latest
62-
use-mamba: true
62+
use-mamba: 'true'
6363
channels: conda-forge
64+
conda-remove-defaults: 'true'
6465
python-version: ${{ matrix.python }}
6566
activate-environment: 'build'
6667

67-
# Here is an issue in conda gh-12356 causing adding defaults to the list of channels
68-
# upon running `conda config --append channels conda-forge`, while mamba requires to have only conda-forge channel
69-
- name: Remove defaults channel
70-
run: |
71-
conda config --remove channels defaults
72-
conda config --show
73-
7468
# Sometimes `mamba install ...` fails due to slow download speed rate, so disable the check in mamba
7569
- name: Disable speed limit check in mamba
7670
run: echo "MAMBA_NO_LOW_SPEED_LIMIT=1" >> $GITHUB_ENV
@@ -84,18 +78,6 @@ jobs:
8478
- name: Install conda-build
8579
run: mamba install conda-build=${{ env.CONDA_BUILD_VERSION}}
8680

87-
- name: Cache conda packages
88-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
89-
env:
90-
CACHE_NUMBER: 1 # Increase to reset cache
91-
with:
92-
path: ${{ env.CONDA_PKGS_DIR }}
93-
key:
94-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-${{hashFiles('**/meta.yaml') }}
95-
restore-keys: |
96-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
97-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
98-
9981
- name: Build conda package
10082
run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.CHANNELS }} conda-recipe
10183
env:
@@ -131,7 +113,6 @@ jobs:
131113
continue-on-error: true
132114

133115
env:
134-
conda-pkgs: '/home/runner/conda_pkgs_dir/'
135116
channel-path: '${{ github.workspace }}/channel/'
136117
pkg-path-in-channel: '${{ github.workspace }}/channel/linux-64/'
137118
extracted-pkg-path: '${{ github.workspace }}/pkg/'
@@ -151,17 +132,15 @@ jobs:
151132
tar -xvf ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.tar.bz2 -C ${{ env.extracted-pkg-path }}
152133
153134
- name: Setup miniconda
154-
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
135+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
155136
with:
156137
miniforge-version: latest
157-
use-mamba: true
138+
use-mamba: 'true'
158139
channels: conda-forge
140+
conda-remove-defaults: 'true'
159141
python-version: ${{ matrix.python }}
160142
activate-environment: ${{ env.TEST_ENV_NAME }}
161143

162-
- name: Remove defaults channel
163-
run: conda config --remove channels defaults
164-
165144
- name: Install conda-index
166145
run: mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
167146

@@ -174,30 +153,13 @@ jobs:
174153
mamba search ${{ env.PACKAGE_NAME }} -c ${{ env.channel-path }} --override-channels --info --json > ${{ env.ver-json-path }}
175154
cat ${{ env.ver-json-path }}
176155
177-
- name: Collect dependencies
156+
- name: Get package version
178157
run: |
179158
export PACKAGE_VERSION=$(python -c "${{ env.VER_SCRIPT1 }} ${{ env.VER_SCRIPT2 }}")
180159
181160
echo PACKAGE_VERSION=${PACKAGE_VERSION}
182161
echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> $GITHUB_ENV
183162
184-
mamba install ${{ env.PACKAGE_NAME }}=${PACKAGE_VERSION} python=${{ matrix.python }} ${{ env.TEST_CHANNELS }} --only-deps --dry-run > lockfile
185-
cat lockfile
186-
env:
187-
TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'
188-
189-
- name: Cache conda packages
190-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
191-
env:
192-
CACHE_NUMBER: 1 # Increase to reset cache
193-
with:
194-
path: ${{ env.conda-pkgs }}
195-
key:
196-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-${{hashFiles('lockfile') }}
197-
restore-keys: |
198-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
199-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
200-
201163
- name: Install dpnp
202164
run: mamba install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
203165
env:
@@ -251,7 +213,6 @@ jobs:
251213
continue-on-error: true
252214

253215
env:
254-
conda-pkgs: 'C:\Users\runneradmin\conda_pkgs_dir\'
255216
channel-path: '${{ github.workspace }}\channel\'
256217
pkg-path-in-channel: '${{ github.workspace }}\channel\win-64\'
257218
extracted-pkg-path: '${{ github.workspace }}\pkg'
@@ -280,17 +241,15 @@ jobs:
280241
dir ${{ env.extracted-pkg-path }}
281242
282243
- name: Setup miniconda
283-
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
244+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
284245
with:
285246
miniforge-version: latest
286-
use-mamba: true
247+
use-mamba: 'true'
287248
channels: conda-forge
249+
conda-remove-defaults: 'true'
288250
python-version: ${{ matrix.python }}
289251
activate-environment: ${{ env.TEST_ENV_NAME }}
290252

291-
- name: Remove defaults channel
292-
run: conda config --remove channels defaults
293-
294253
- name: Store conda paths as envs
295254
run: |
296255
@echo on
@@ -313,7 +272,7 @@ jobs:
313272
- name: Dump version.json
314273
run: more ${{ env.ver-json-path }}
315274

316-
- name: Collect dependencies
275+
- name: Get package version
317276
run: |
318277
@echo on
319278
set "SCRIPT=${{ env.VER_SCRIPT1 }} ${{ env.VER_SCRIPT2 }}"
@@ -323,25 +282,6 @@ jobs:
323282
echo PACKAGE_VERSION: %PACKAGE_VERSION%
324283
(echo PACKAGE_VERSION=%PACKAGE_VERSION%) >> %GITHUB_ENV%
325284
326-
mamba install ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% python=${{ matrix.python }} ${{ env.TEST_CHANNELS }} --only-deps --dry-run > lockfile
327-
env:
328-
TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'
329-
330-
- name: Dump lockfile
331-
run: more lockfile
332-
333-
- name: Cache conda packages
334-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
335-
env:
336-
CACHE_NUMBER: 1 # Increase to reset cache
337-
with:
338-
path: ${{ env.conda-pkgs }}
339-
key:
340-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-${{hashFiles('lockfile') }}
341-
restore-keys: |
342-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
343-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
344-
345285
- name: Install dpnp
346286
run: |
347287
@echo on
@@ -425,17 +365,15 @@ jobs:
425365
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
426366

427367
- name: Setup miniconda
428-
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
368+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
429369
with:
430370
miniforge-version: latest
431-
use-mamba: true
371+
use-mamba: 'true'
432372
channels: conda-forge
373+
conda-remove-defaults: 'true'
433374
python-version: ${{ matrix.python }}
434375
activate-environment: 'upload'
435376

436-
- name: Remove defaults channel
437-
run: conda config --remove channels defaults
438-
439377
- name: Install anaconda-client
440378
run: mamba install anaconda-client
441379

@@ -464,18 +402,16 @@ jobs:
464402
shell: bash -el {0}
465403

466404
steps:
467-
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
405+
- uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
468406
with:
469407
miniforge-version: latest
470-
use-mamba: true
408+
use-mamba: 'true'
471409
channels: conda-forge
472-
run-post: false
410+
conda-remove-defaults: 'true'
411+
run-post: 'false'
473412
python-version: '3.12'
474413
activate-environment: 'cleanup'
475414

476-
- name: Remove defaults channel
477-
run: conda config --remove channels defaults
478-
479415
- name: Install anaconda-client
480416
run: mamba install anaconda-client
481417

‎.github/workflows/generate_coverage.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,15 @@ jobs:
6262
sudo apt-get install lcov
6363
6464
- name: Setup miniconda
65-
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
65+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
6666
with:
6767
miniforge-version: latest
68-
use-mamba: true
68+
use-mamba: 'true'
6969
channels: conda-forge
70+
conda-remove-defaults: 'true'
7071
python-version: ${{ env.python-ver }}
7172
activate-environment: 'coverage'
7273

73-
# Here is an issue in conda gh-12356 causing adding defaults to the list of channels
74-
# upon running `conda config --append channels conda-forge`, while mamba requires to have only conda-forge channel
75-
- name: Remove defaults channel
76-
run: |
77-
conda config --remove channels defaults
78-
conda config --show
79-
8074
# Sometimes `mamba install ...` fails due to slow download speed rate, so disable the check in mamba
8175
- name: Disable speed limit check in mamba
8276
run: echo "MAMBA_NO_LOW_SPEED_LIMIT=1" >> $GITHUB_ENV

‎.github/workflows/openssf-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ jobs:
6868

6969
# Upload the results to GitHub's code scanning dashboard.
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
71+
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
7272
with:
7373
sarif_file: results.sarif

0 commit comments

Comments
 (0)