Skip to content

Commit 02abc73

Browse files
TomAugspurgerjreback
authored andcommitted
CI: Unpin NumPy (#23465)
1 parent e9ca781 commit 02abc73

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

ci/travis-37-numpydev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ dependencies:
1313
- "git+git://github.com/dateutil/dateutil.git"
1414
- "-f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
1515
- "--pre"
16-
- "numpy<=1.16.0.dev0+20181015190246"
16+
- "numpy"
1717
- "scipy"

pandas/core/groupby/generic.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,9 @@ def first_not_none(values):
410410
if (isinstance(v.index, MultiIndex) or
411411
key_index is None or
412412
isinstance(key_index, MultiIndex)):
413-
stacked_values = np.vstack(map(np.asarray, values))
413+
stacked_values = np.vstack([
414+
np.asarray(v) for v in values
415+
])
414416
result = DataFrame(stacked_values, index=key_index,
415417
columns=index)
416418
else:
@@ -422,7 +424,8 @@ def first_not_none(values):
422424
axis=self.axis).unstack()
423425
result.columns = index
424426
else:
425-
stacked_values = np.vstack(map(np.asarray, values))
427+
stacked_values = np.vstack([np.asarray(v)
428+
for v in values])
426429
result = DataFrame(stacked_values.T, index=v.index,
427430
columns=key_index)
428431

pandas/util/_test_decorators.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,10 @@ def _skip_if_not_us_locale():
104104

105105

106106
def _skip_if_no_scipy():
107-
return not (safe_import('scipy.stats') and safe_import('scipy.sparse') and
108-
safe_import('scipy.interpolate'))
107+
return not (safe_import('scipy.stats') and
108+
safe_import('scipy.sparse') and
109+
safe_import('scipy.interpolate') and
110+
safe_import('scipy.signal'))
109111

110112

111113
def _skip_if_no_lzma():

0 commit comments

Comments
 (0)