mirror of
https://github.com/wassname/simpeg.git
synced 2026-07-03 18:40:51 +08:00
Merge branch 'master' of https://github.com/simpeg/simpegDC into Tx2Src
Conflicts: simpegDC/BaseDC.py simpegDC/Examples/Verification.py simpegDC/Examples/WennerArray.py
This commit is contained in:
+1
-1
@@ -4,7 +4,7 @@ python:
|
||||
|
||||
# Setup anaconda
|
||||
before_install:
|
||||
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-3.3.0-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-3.3.0-Linux-x86_64.sh -O miniconda.sh; fi
|
||||
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-3.8.3-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-3.8.3-Linux-x86_64.sh -O miniconda.sh; fi
|
||||
- chmod +x miniconda.sh
|
||||
- ./miniconda.sh -b
|
||||
- export PATH=/home/travis/anaconda/bin:/home/travis/miniconda/bin:$PATH
|
||||
|
||||
Reference in New Issue
Block a user