Merge branch 'master' of https://github.com/geoscixyz/gpgLabs

thast · thast · commit 68f35dfe4c87 · 2017-07-21T16:38:21.000-07:00
diff --git a/requirements.txt b/requirements.txt
@@ -1,11 +1 @@
-numpy
-scipy
-matplotlib
-ipywidgets
-pandas
-jupyter_dashboards
-Pillow
-SimPEG
-discretize
-JSAnimation
-em_examples
+-e .
diff --git a/setup.py b/setup.py
@@ -43,7 +43,10 @@
         'properties[math]',
         'SimPEG>=0.4.1',
         'jupyter',
-        'JSAnimation'
+        'jupyter_dashboards',
+        'Pillow',
+        'discretize',
+        'em_examples'
     ],
     author = 'GeoSci Developers',
     author_email = 'lheagy@eos.ubc.ca',
