Skip to content

Commit e88f9b9

Browse files
committed
python_ver -> python
1 parent 3aeb7e9 commit e88f9b9

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888

8989
strategy:
9090
matrix:
91-
python_ver: ["3.10", "3.11", "3.12", "3.13", "3.14"]
91+
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
9292
numpy: ['numpy">=2"']
9393
experimental: [false]
9494
runner: [ubuntu-latest]
@@ -100,7 +100,7 @@ jobs:
100100
- name: Download artifact
101101
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
102102
with:
103-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_ver }}
103+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
104104

105105
- name: Add conda to system path
106106
run: echo "$CONDA"/bin >> "$GITHUB_PATH"
@@ -119,7 +119,7 @@ jobs:
119119
- name: Collect dependencies
120120
run: |
121121
CHANNELS=(-c "$GITHUB_WORKSPACE"/channel ${{ env.CHANNELS }})
122-
conda create -n ${{ env.TEST_ENV_NAME }} "$PACKAGE_NAME" python=${{ matrix.python_ver }} ${{ matrix.numpy }} "${CHANNELS[@]}" --only-deps --dry-run > lockfile
122+
conda create -n ${{ env.TEST_ENV_NAME }} "$PACKAGE_NAME" python=${{ matrix.python }} ${{ matrix.numpy }} "${CHANNELS[@]}" --only-deps --dry-run > lockfile
123123
124124
- name: Display lockfile
125125
run: cat lockfile
@@ -135,15 +135,15 @@ jobs:
135135
with:
136136
path: ~/.conda/pkgs
137137
key:
138-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python_ver }}-${{hashFiles('lockfile') }}
138+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-${{hashFiles('lockfile') }}
139139
restore-keys: |
140-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python_ver }}-
140+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
141141
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
142142
143143
- name: Install mkl_fft
144144
run: |
145145
CHANNELS=(-c "$GITHUB_WORKSPACE"/channel ${{ env.CHANNELS }})
146-
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python_ver }} ${{ matrix.numpy }} "$PACKAGE_NAME" pytest scipy "${CHANNELS[@]}"
146+
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python }} ${{ matrix.numpy }} "$PACKAGE_NAME" pytest scipy "${CHANNELS[@]}"
147147
# Test installed packages
148148
conda list -n ${{ env.TEST_ENV_NAME }}
149149
@@ -230,7 +230,7 @@ jobs:
230230

231231
strategy:
232232
matrix:
233-
python_ver: ["3.10", "3.11", "3.12", "3.13", "3.14"]
233+
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
234234
numpy: ['numpy">=2"']
235235
experimental: [false]
236236
runner: [windows-latest]
@@ -243,7 +243,7 @@ jobs:
243243
- name: Download artifact
244244
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
245245
with:
246-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_ver }}
246+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
247247

248248
- uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
249249
with:
@@ -290,7 +290,7 @@ jobs:
290290
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
291291
SET PACKAGE_VERSION=%%F
292292
)
293-
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% python=${{ matrix.python_ver }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }} --only-deps --dry-run > lockfile
293+
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% python=${{ matrix.python }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }} --only-deps --dry-run > lockfile
294294
295295
- name: Display lockfile content
296296
shell: pwsh
@@ -303,9 +303,9 @@ jobs:
303303
with:
304304
path: /home/runner/conda_pkgs_dir
305305
key:
306-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python_ver }}-${{hashFiles('lockfile') }}
306+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-${{hashFiles('lockfile') }}
307307
restore-keys: |
308-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python_ver }}-
308+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
309309
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
310310
311311
- name: Install mkl_fft
@@ -320,7 +320,7 @@ jobs:
320320
SET PACKAGE_VERSION=%%F
321321
)
322322
SET "TEST_DEPENDENCIES=pytest scipy"
323-
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python_ver }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
323+
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 }}
324324
325325
- name: Report content of test environment
326326
shell: cmd /C CALL {0}

0 commit comments

Comments
 (0)