pin pandas to 0.24.x

see #77
ilastik · Oct 25, 2019 · 5d8440f · 5d8440f
1 parent b89ac79
commit 5d8440f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/ilastik-pins.yaml b/ilastik-pins.yaml
@@ -17,6 +17,9 @@ networkx:
   - 2
 numpy:
   - 1.14
+# see https://github.com/ilastik/ilastik-conda-recipes/issues/77
+pandas:
+  - 0.24
 python:
   - 3.7
 pyqt:

diff --git a/recipes/ilastik-dependencies/conda_build_config.yaml b/recipes/ilastik-dependencies/conda_build_config.yaml
@@ -5,7 +5,9 @@ hdf5:
 networkx:
   - 2
 numpy:
-  - 1.12
+  - 1.14
+pandas:
+  - 0.24
 python:
   - 3.7
 pyqt:
@@ -29,6 +31,7 @@ pin_run_as_build:
   hdf5: x.x.x
   networkx: x.x
   numpy: x.x
+  pandas: x.x
   python: x.x
   pyqt: x.x
   qt: x.x

diff --git a/recipes/ilastik-dependencies/meta.yaml b/recipes/ilastik-dependencies/meta.yaml
@@ -23,7 +23,7 @@ package:
     version: 1.3.3
 
 build:
-  number: 1005
+  number: 1006
   track_features:
     # on osx we need to make sure that we install the numpy versions with openblas instead of mkl to prevent clashes with cplex
     - blas_openblas #[osx] 
@@ -45,8 +45,9 @@ requirements:
     - h5py                      {{ h5py }}
     - hdf5                      {{ hdf5 }}
     - jsonschema                
-    - networkx                  {{ networkx }}      # TODO API change in 2.0
+    - networkx                  {{ networkx }}
     - nose
+    - pandas                    {{ pandas }}*
     - pillow                    {{ pillow }}
     - pytest                    {{ pytest }}
     - pytest-qt
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,9 @@ networkx: @@
       - 2
     numpy:
       - 1.14
+    # see https://github.com/ilastik/ilastik-conda-recipes/issues/77
+    pandas:
+      - 0.24
     python:
       - 3.7
     pyqt:
@@ Expand Down @@