Merge pull request #1 from simpeg-research/tests/conda

Tests/conda
simpeg-research · Apr 12, 2018 · 378afe6 · 378afe6
2 parents ae137af + fa49e35
commit 378afe6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,10 +21,10 @@ before_install:
   - conda update --yes conda
 
 install:
-  - conda install --quiet --yes pip python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib jupyter cython mkl
-  - pip install -r requirements.txt
-  - pip install -r requirements_dev.txt
+  - conda env create -f environment.yml
+  - source activate aem-environment
   - export MPLBACKEND="agg"
+  - pip install -r requirements_dev.txt
 
 script:
   - travis_wait 30 nosetests tests -v -s
diff --git a/environment.yml b/environment.yml
@@ -1,3 +1,5 @@
+name: aem-environment
+
 channels:
   - conda-forge
   - defaults

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,9 +1,2 @@
-numpy
-scipy
-matplotlib
-ipywidgets
-discretize
-SimPEG
-pymatsolver
 testipynb
 nose