Skip to content

Commit 9d250c4

Browse files
committed
Restore installing SciPy from defaults instead of conda-forge on public CI
This fixes fetching SciPy from defaults instead of conda-forge, now that a suitable SciPy 1.9 has become available. This is a partial revert of #8413 since only the changes for the public ci build scripts, that pertain to the installation of SciPy are included.
1 parent 1c07efb commit 9d250c4

2 files changed

Lines changed: 2 additions & 9 deletions

File tree

‎buildscripts/incremental/setup_conda_environment.cmd‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ call deactivate
2222
@rem Display root environment (for debugging)
2323
conda list
2424
@rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite
25-
conda create -n %CONDA_ENV% -q -y python=%PYTHON% numpy=%NUMPY% cffi pip jinja2 ipython gitpython pyyaml
25+
conda create -n %CONDA_ENV% -q -y python=%PYTHON% numpy=%NUMPY% cffi pip scipy jinja2 ipython gitpython pyyaml
2626

2727
call activate %CONDA_ENV%
28-
@rem Scipy comes from conda-forge for NumPy 1.23
29-
if %NUMPY% == "1.23" (%CONDA_INSTALL% conda-forge::scipy) else (%CONDA_INSTALL% scipy)
3028
@rem Install latest llvmlite build
3129
%CONDA_INSTALL% -c numba/label/dev llvmlite=0.40
3230
@rem Install required backports for older Pythons

‎buildscripts/incremental/setup_conda_environment.sh‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,7 @@ if [ "${VANILLA_INSTALL}" != "yes" ]; then
4848
# dependencies, but exercised in the test suite
4949
# pexpect is used to run the gdb tests.
5050
# ipykernel is used for testing ipython behaviours.
51-
$CONDA_INSTALL ${EXTRA_CHANNELS} cffi jinja2 ipython ipykernel pygments pexpect
52-
if [[ "$NUMPY" == "1.23" ]] ; then
53-
$CONDA_INSTALL ${EXTRA_CHANNELS} conda-forge::scipy
54-
else
55-
$CONDA_INSTALL ${EXTRA_CHANNELS} scipy
56-
fi
51+
$CONDA_INSTALL ${EXTRA_CHANNELS} cffi jinja2 ipython ipykernel scipy pygments pexpect
5752
fi
5853

5954
# Install the compiler toolchain and gdb (if available)

0 commit comments

Comments
 (0)