diff --git a/ci/travis-37-numpydev.yaml b/ci/travis-37-numpydev.yaml index 957941b7379aa..82c75b7c91b1f 100644 --- 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 index 3ed80d266ce4d..5d9a5616e133b 100644 --- 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 index 52a6740f119b7..3f8332ade4487 100644 --- 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(): diff --git a/setup.cfg b/setup.cfg index 8a3cfd1551a46..02da97b4e0534 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,7 +36,6 @@ split_penalty_after_opening_bracket = 1000000 split_penalty_logical_operator = 30 [tool:pytest] -minversion = 3.6 testpaths = pandas markers = single: mark a test as single cpu only