Skip to content

Commit b08c16f

Browse files
vtavanavtavana
authored
Merge branch 'master' into update_sort
2 parents 9954afa + 81047fa commit b08c16f

File tree

4 files changed

+28
-54
lines changed

4 files changed

+28
-54
lines changed

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

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
pull-requests: write
3737

3838
env:
39-
python-ver: '3.9'
39+
python-ver: '3.12'
4040
CHANNELS: '-c dppy/label/dev -c intel -c conda-forge --override-channels'
4141
NO_INTEL_CHANNELS: '-c dppy/label/dev -c conda-forge --override-channels'
4242
# Install the latest oneAPI compiler to work around an issue
@@ -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
@@ -132,16 +126,16 @@ jobs:
132126
- name: Install dpnp dependencies
133127
if: env.INSTALL_ONE_API == 'yes'
134128
run: |
135-
mamba install numpy"<1.24" dpctl">=0.18.0dev0" cmake cython pytest ninja scikit-build ${{ env.NO_INTEL_CHANNELS }}
129+
mamba install numpy dpctl">=0.18.0dev0" cmake cython pytest ninja scikit-build ${{ env.NO_INTEL_CHANNELS }}
136130
137131
- name: Install dpnp dependencies
138132
if: env.INSTALL_ONE_API != 'yes'
139133
run: |
140-
mamba install numpy"<1.24" dpctl">=0.18.0dev0" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \
134+
mamba install numpy dpctl">=0.18.0dev0" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \
141135
cmake cython pytest ninja scikit-build ${{ env.CHANNELS }}
142136
143137
- name: Install cuPy dependencies
144-
run: mamba install cupy cudatoolkit=10.0
138+
run: mamba install cupy
145139

146140
- name: Conda info
147141
run: mamba info

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

Lines changed: 17 additions & 31 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
@@ -89,7 +83,7 @@ jobs:
8983
env:
9084
CACHE_NUMBER: 1 # Increase to reset cache
9185
with:
92-
path: ${{ env.CONDA_PKGS_DIR }}
86+
path: ${{ runner.os == 'Linux' && '/home/runner/conda_pkgs_dir' || 'C:\Users\runneradmin\conda_pkgs_dir' }}
9387
key:
9488
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-${{hashFiles('**/meta.yaml') }}
9589
restore-keys: |
@@ -151,17 +145,15 @@ jobs:
151145
tar -xvf ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.tar.bz2 -C ${{ env.extracted-pkg-path }}
152146
153147
- name: Setup miniconda
154-
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
148+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
155149
with:
156150
miniforge-version: latest
157-
use-mamba: true
151+
use-mamba: 'true'
158152
channels: conda-forge
153+
conda-remove-defaults: 'true'
159154
python-version: ${{ matrix.python }}
160155
activate-environment: ${{ env.TEST_ENV_NAME }}
161156

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

@@ -280,17 +272,15 @@ jobs:
280272
dir ${{ env.extracted-pkg-path }}
281273
282274
- name: Setup miniconda
283-
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
275+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
284276
with:
285277
miniforge-version: latest
286-
use-mamba: true
278+
use-mamba: 'true'
287279
channels: conda-forge
280+
conda-remove-defaults: 'true'
288281
python-version: ${{ matrix.python }}
289282
activate-environment: ${{ env.TEST_ENV_NAME }}
290283

291-
- name: Remove defaults channel
292-
run: conda config --remove channels defaults
293-
294284
- name: Store conda paths as envs
295285
run: |
296286
@echo on
@@ -425,17 +415,15 @@ jobs:
425415
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
426416

427417
- name: Setup miniconda
428-
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
418+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
429419
with:
430420
miniforge-version: latest
431-
use-mamba: true
421+
use-mamba: 'true'
432422
channels: conda-forge
423+
conda-remove-defaults: 'true'
433424
python-version: ${{ matrix.python }}
434425
activate-environment: 'upload'
435426

436-
- name: Remove defaults channel
437-
run: conda config --remove channels defaults
438-
439427
- name: Install anaconda-client
440428
run: mamba install anaconda-client
441429

@@ -464,18 +452,16 @@ jobs:
464452
shell: bash -el {0}
465453

466454
steps:
467-
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
455+
- uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
468456
with:
469457
miniforge-version: latest
470-
use-mamba: true
458+
use-mamba: 'true'
471459
channels: conda-forge
472-
run-post: false
460+
conda-remove-defaults: 'true'
461+
run-post: 'false'
473462
python-version: '3.12'
474463
activate-environment: 'cleanup'
475464

476-
- name: Remove defaults channel
477-
run: conda config --remove channels defaults
478-
479465
- name: Install anaconda-client
480466
run: mamba install anaconda-client
481467

‎.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)