Skip to content

Commit 03879f4

Browse files
committed
MAINT upgrade conda installation for circle-ci
1 parent 593cd69 commit 03879f4

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

ci_scripts/circle_install.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# here.
77
source activate testenv
88

9+
export CC=`which gcc`
910
# install documentation building dependencies
1011
pip install --upgrade numpy
1112
pip install --upgrade matplotlib setuptools nose coverage sphinx==1.5.5 sphinx_bootstrap_theme numpydoc
@@ -16,4 +17,4 @@ python setup.py clean
1617
python setup.py develop
1718

1819
# pipefail is necessary to propagate exit codes
19-
set -o pipefail && cd doc && make html 2>&1 | tee ~/log.txt
20+
set -o pipefail && cd doc && make html 2>&1 | tee ~/log.txt

circle.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ dependencies:
2626
- sudo -E apt-get -yq remove texlive-binaries --purge
2727
- sudo -E apt-get -yq update
2828
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install dvipng texlive-latex-base texlive-latex-extra
29+
# Other stuff...
30+
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install build-essential
2931
# Conda installation
3032
- wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh
3133
- bash ~/miniconda.sh -b -p $HOME/miniconda
32-
- conda update --yes conda
3334
- conda create -n testenv --yes python=3.6 pip wheel nose gcc swig
3435

3536
# The --user is needed to let sphinx see the source and the binaries

0 commit comments

Comments
 (0)