8000 CI Use stable numpy scipy release for [icc-build] and [arm64] on trav… · scikit-learn/scikit-learn@98e3945 · GitHub
[go: up one dir, main page]

Skip to content

Commit 98e3945

Browse files
ogriseljeremiedbb
authored andcommitted
CI Use stable numpy scipy release for [icc-build] and [arm64] on travis (#19176)
The scipy-dev builds have moved to Azure Pipelines and there is no reason to not use stable versions of numpy and scipy to run the ICC and ARM64 tests on travis. This should fix the invalid wheel metadata failure observed on travis which was already resolved on Azure Pipelines by using the legacy pip dependency resolver for the scipy-dev build.
1 parent 8ab77b2 commit 98e3945

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

build_tools/travis/install_master.sh

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,8 @@ conda update --yes conda
5050
conda create -n testenv --yes python=3.7
5151

5252
source activate testenv
53-
54-
if [[ $TRAVIS_CPU_ARCH == amd64 ]]; then
55-
echo "Upgrading pip and setuptools."
56-
pip install --upgrade pip setuptools
57-
echo "Installing numpy, scipy and pandas master wheels."
58-
dev_anaconda_url=https://pypi.anaconda.org/scipy-wheels-nightly/simple
59-
pip install --pre --upgrade --timeout=60 --extra-index $dev_anaconda_url numpy scipy pandas
60-
echo "Installing cython pre-release wheels."
61-
pip install --pre cython
62-
echo "Installing joblib master."
63-
pip install https://github.com/joblib/joblib/archive/master.zip
64-
echo "Installing pillow master."
65-
pip install https://github.com/python-pillow/Pillow/archive/master.zip
66-
else
67-
conda install -y scipy numpy pandas cython
68-
pip install joblib threadpoolctl
69-
fi
53+
conda install -y scipy numpy pandas cython
54+
pip install joblib threadpoolctl
7055

7156
pip install $(get_dep pytest $PYTEST_VERSION) pytest-xdist
7257

0 commit comments

Comments
 (0)
0