Merge pull request #296 from PeterDSteinberg/fix-pandas

fix numpy and pandas versions
PSLmodels · May 13, 2017 · 9e92129 · 9e92129
2 parents 537b607 + 5782215
commit 9e92129
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Python/conda.recipe/meta.yaml b/Python/conda.recipe/meta.yaml
@@ -5,8 +5,8 @@ package:
 requirements:
   build:
     - matplotlib
-    - numpy
-    - pandas
+    - numpy >=1.12.1
+    - pandas >=0.20.1
     - pytest
     - python
     - scipy
@@ -15,8 +15,8 @@ requirements:
 
   run:
     - matplotlib
-    - numpy
-    - pandas
+    - numpy >=1.12.1
+    - pandas >=0.20.1
     - pytest
     - python
     - scipy

diff --git a/environment.yml b/environment.yml
@@ -10,6 +10,7 @@ dependencies:
 - taxcalc
 - numba
 - numpy
-- pandas=0.16.1
+- numpy >=1.12.1
+- pandas >=0.20.1
 - pytest
 - python=2.7