Skip to content

Commit 856d9e5

Browse files
authored
BLD: fix conda install - try again (#18841)
1 parent b32dd63 commit 856d9e5

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

ci/install_travis.sh

+2-5
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,14 @@ echo
4848
echo "[update conda]"
4949
conda config --set ssl_verify false || exit 1
5050
conda config --set quiet true --set always_yes true --set changeps1 false || exit 1
51-
52-
conda install conda=4.3.30
53-
# conda update -q conda
51+
conda update -q conda
5452

5553
if [ "$CONDA_BUILD_TEST" ]; then
5654
echo
5755
echo "[installing conda-build]"
5856
conda install conda-build
5957
fi
6058

61-
6259
echo
6360
echo "[add channels]"
6461
conda config --remove channels defaults || exit 1
@@ -125,7 +122,7 @@ if [ "$COVERAGE" ]; then
125122
fi
126123

127124
echo
128-
if [ -z "$PIP_BUILD_TEST" ] and [ -z "$CONDA_BUILD_TEST" ]; then
125+
if [ -z "$PIP_BUILD_TEST" ] && [ -z "$CONDA_BUILD_TEST" ]; then
129126

130127
# build but don't install
131128
echo "[build em]"

0 commit comments

Comments
 (0)