Skip to content

Commit

Permalink
ci(travis): update travis.yml to install miniconda instead of apt pyt…
Browse files Browse the repository at this point in the history
…hon (#346)
  • Loading branch information
jdhughes-usgs authored Mar 13, 2020
1 parent 6c70f0f commit 85c5ace
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@ doc/ConverterGuide/*.pdf
doc/zonebudget/*.pdf

bin/mf6
bin/libmf6.*
bin/mf5to6
bin/zbud6
bin/*.txt

tmp_simulations/
autotest/temp/
Expand All @@ -71,6 +73,8 @@ mod_temp/
obj_temp/
src_temp/

trash/

.ipynb_checkpoints/

distrib_training/mf6beta*
Expand All @@ -87,3 +91,6 @@ Thumbs.db
*.bat

msvs/My Advisor Results*

build/
CMakeFiles/
15 changes: 9 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,26 @@ before_install:
- sudo apt-get install -y $FC
- sudo apt-get install -y texlive texlive-latex-extra
texlive-latex-recommended texlive-science texlive-fonts-extra
- sudo apt-get install -y graphviz python3-pip python3-setuptools
python3-matplotlib python3-netcdf4 python3-pyproj python3-pyshp
python3-shapely python3-tk
- curl https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh > $HOME/miniconda.sh
- bash $HOME/miniconda.sh -b -p $HOME/anaconda
- export PATH="$HOME/anaconda/bin:$PATH"
- hash -r
- conda config --set always_yes yes
- conda config --add channels conda-forge
- conda install --file requirements.travis.txt
install:
- if [[ ! -d "$HOME/.local/bin" ]]; then mkdir "$HOME/.local/bin"; fi
- ln -fs /usr/bin/$FC $HOME/.local/bin/gfortran
- ln -fs /usr/bin/python3 $HOME/.local/bin/python
- gfortran --version
- python --version
- pip3 install --user --upgrade pip
- pip --version
- pip config --user set global.progress_bar off
- pip install --user nose-timer pydotplus
- git clone https://github.com/modflowpy/flopy --depth 1 --branch=develop ~/flopy
- pip install --user -e ~/flopy
- git clone https://github.com/modflowpy/pymake --depth 1 --branch=master ~/pymake
- pip install --user -e ~/pymake
- git clone https://github.com/mjr-deltares/modflow6-bmipy.git --depth 1 --branch=master ~/ami
- conda-develop ~/ami/
script:
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH;
else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
Expand Down
8 changes: 7 additions & 1 deletion requirements.travis.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
pydotplus>=2.0
conda-build
matplotlib
netcdf4
pyproj
pyshp
shapely
tk
pip
nose-timer
pydotplus
bmipy

0 comments on commit 85c5ace

Please sign in to comment.