CI: Unpin NumPy (pandas-dev#23465)

JustinZhengBC · Nov 14, 2018 · 510ba4e · 510ba4e
1 parent 53dad83
commit 510ba4e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/ci/travis-37-numpydev.yaml b/ci/travis-37-numpydev.yaml
@@ -13,5 +13,5 @@ dependencies:
     - "git+git://github.com/dateutil/dateutil.git"
     - "-f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
     - "--pre"
-    - "numpy<=1.16.0.dev0+20181015190246"
+    - "numpy"
     - "scipy"
diff --git a/pandas/core/groupby/generic.py b/pandas/core/groupby/generic.py
@@ -410,7 +410,9 @@ def first_not_none(values):
                         if (isinstance(v.index, MultiIndex) or
                                 key_index is None or
                                 isinstance(key_index, MultiIndex)):
-                            stacked_values = np.vstack(map(np.asarray, values))
+                            stacked_values = np.vstack([
+                                np.asarray(v) for v in values
+                            ])
                             result = DataFrame(stacked_values, index=key_index,
                                                columns=index)
                         else:
@@ -422,7 +424,8 @@ def first_not_none(values):
                                             axis=self.axis).unstack()
                             result.columns = index
                     else:
-                        stacked_values = np.vstack(map(np.asarray, values))
+                        stacked_values = np.vstack([np.asarray(v)
+                                                    for v in values])
                         result = DataFrame(stacked_values.T, index=v.index,
                                            columns=key_index)
 

diff --git a/pandas/util/_test_decorators.py b/pandas/util/_test_decorators.py
@@ -104,8 +104,10 @@ def _skip_if_not_us_locale():
 
 
 def _skip_if_no_scipy():
-    return not (safe_import('scipy.stats') and safe_import('scipy.sparse') and
-                safe_import('scipy.interpolate'))
+    return not (safe_import('scipy.stats') and
+                safe_import('scipy.sparse') and
+                safe_import('scipy.interpolate') and
+                safe_import('scipy.signal'))
 
 
 def _skip_if_no_lzma():