From 52c1f1b37b158195577049790b2e8a62934d7200 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 6 Nov 2019 11:30:31 -0500 Subject: [PATCH 1/5] CI: workaround numpydev bug We don't want this long-term. But there's no easy way to skip this for numpydev, since it errors in setup. --- pandas/core/arrays/sparse/array.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandas/core/arrays/sparse/array.py b/pandas/core/arrays/sparse/array.py index e1691de234335..f585bfb07d31b 100644 --- a/pandas/core/arrays/sparse/array.py +++ b/pandas/core/arrays/sparse/array.py @@ -1572,6 +1572,9 @@ def make_sparse(arr, kind="block", fill_value=None, dtype=None, copy=False): mask = splib.make_mask_object_ndarray(arr, fill_value) else: mask = arr != fill_value + # https://github.com/pandas-dev/pandas/issues/29432 + # workaround numpydev issue + mask = mask.astype(bool) length = len(arr) if length != len(mask): From c6d9985db61a6c8f64394ddf2cef7717b18ff92c Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 6 Nov 2019 12:12:02 -0500 Subject: [PATCH 2/5] Revert "CI: workaround numpydev bug" This reverts commit 52c1f1b37b158195577049790b2e8a62934d7200. --- pandas/core/arrays/sparse/array.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pandas/core/arrays/sparse/array.py b/pandas/core/arrays/sparse/array.py index f585bfb07d31b..e1691de234335 100644 --- a/pandas/core/arrays/sparse/array.py +++ b/pandas/core/arrays/sparse/array.py @@ -1572,9 +1572,6 @@ def make_sparse(arr, kind="block", fill_value=None, dtype=None, copy=False): mask = splib.make_mask_object_ndarray(arr, fill_value) else: mask = arr != fill_value - # https://github.com/pandas-dev/pandas/issues/29432 - # workaround numpydev issue - mask = mask.astype(bool) length = len(arr) if length != len(mask): From f1e29ff344795fa5ed7178c1659bcb8bdec80836 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 6 Nov 2019 12:15:08 -0500 Subject: [PATCH 3/5] ignore numpydev --- ci/azure/posix.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 281107559a38c..67b0007d177a5 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -52,6 +52,9 @@ jobs: TEST_ARGS: "-W error" PANDAS_TESTING_MODE: "deprecate" EXTRA_APT: "xsel" + # https://github.com/pandas-dev/pandas/issues/29432 + # remove continueOnError + continueOnError: true steps: - script: | From e187bbfcaf3f998a26a1614e60ba0e1f5587c842 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 6 Nov 2019 12:56:45 -0500 Subject: [PATCH 4/5] ignore numpydev --- ci/azure/posix.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 67b0007d177a5..ea51c69614f29 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -45,16 +45,16 @@ jobs: PATTERN: "not slow and not network" LOCALE_OVERRIDE: "zh_CN.UTF-8" - py37_np_dev: - ENV_FILE: ci/deps/azure-37-numpydev.yaml - CONDA_PY: "37" - PATTERN: "not slow and not network" - TEST_ARGS: "-W error" - PANDAS_TESTING_MODE: "deprecate" - EXTRA_APT: "xsel" - # https://github.com/pandas-dev/pandas/issues/29432 - # remove continueOnError - continueOnError: true + # https://github.com/pandas-dev/pandas/issues/29432 + # py37_np_dev: + # ENV_FILE: ci/deps/azure-37-numpydev.yaml + # CONDA_PY: "37" + # PATTERN: "not slow and not network" + # TEST_ARGS: "-W error" + # PANDAS_TESTING_MODE: "deprecate" + # EXTRA_APT: "xsel" + # # TODO: + # continueOnError: true steps: - script: | From 0ce4ca5da7d013ca6db2430c970a4609703acf94 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 6 Nov 2019 13:29:45 -0500 Subject: [PATCH 5/5] whitespace --- ci/azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index ea51c69614f29..62b15bae6d2ce 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -53,7 +53,7 @@ jobs: # TEST_ARGS: "-W error" # PANDAS_TESTING_MODE: "deprecate" # EXTRA_APT: "xsel" - # # TODO: + # # TODO: # continueOnError: true steps: