Skip to content

Commit 697177a

Browse files
author
Vahid Tavanashad
committed
use conda-remove-defaults
1 parent f2456e9 commit 697177a

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ jobs:
3939
run: echo $CONDA/bin >> $GITHUB_PATH
4040
- name: Install conda-build
4141
run: conda install conda-build
42-
- name: Build conda package with NumPy 2
42+
- name: Build conda package with NumPy 2.0
4343
run: |
4444
CHANNELS="-c conda-forge --override-channels"
45-
VERSIONS="--python ${{ matrix.python }} --numpy 2"
45+
VERSIONS="--python ${{ matrix.python }} --numpy 2.3"
4646
TEST="--no-test"
4747
4848
conda build \
@@ -137,9 +137,7 @@ jobs:
137137
activate-environment: build
138138
python-version: ${{ matrix.python }}
139139
channels: conda-forge,nodefaults
140-
141-
- name: Remove defaults channel
142-
run: conda config --remove channels defaults
140+
conda-remove-defaults: 'true'
143141

144142
- name: Install conda-build
145143
run: conda install -n base conda-build
@@ -159,7 +157,7 @@ jobs:
159157
- name: Build conda package with NumPy 2.0
160158
run: |
161159
conda activate
162-
conda build --no-test --python ${{ matrix.python }} --numpy 2 -c conda-forge --override-channels conda-recipe-cf
160+
conda build --no-test --python ${{ matrix.python }} --numpy 2.3 -c conda-forge --override-channels conda-recipe-cf
163161
164162
- name: Store conda paths as envs
165163
shell: bash -l {0}
@@ -201,9 +199,7 @@ jobs:
201199
activate-environment: ${{ env.TEST_ENV_NAME }}
202200
python-version: ${{ matrix.python }}
203201
channels: conda-forge
204-
205-
- name: Remove defaults channel
206-
run: conda config --remove channels defaults
202+
conda-remove-defaults: 'true'
207203

208204
- name: Create conda channel with the artifact bit
209205
shell: cmd /C CALL {0}

.github/workflows/conda-package.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,7 @@ jobs:
135135
activate-environment: build
136136
python-version: ${{ matrix.python }}
137137
channels: conda-forge
138-
139-
- name: Remove defaults channel
140-
run: conda config --remove channels defaults
138+
conda-remove-defaults: 'true'
141139

142140
- name: Install conda-build
143141
run: |
@@ -199,9 +197,7 @@ jobs:
199197
activate-environment: ${{ env.TEST_ENV_NAME }}
200198
python-version: ${{ matrix.python }}
201199
channels: conda-forge
202-
203-
- name: Remove defaults channel
204-
run: conda config --remove channels defaults
200+
conda-remove-defaults: 'true'
205201

206202
- name: Create conda channel with the artifact bit
207203
shell: cmd /C CALL {0}

0 commit comments

Comments
 (0)