From 5b39d0207e771c5cdcd407fdbaf35f4da0c8fb12 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:17:22 -0700 Subject: [PATCH 01/31] TST --- pandas/tests/frame/indexing/test_get_value.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pandas/tests/frame/indexing/test_get_value.py b/pandas/tests/frame/indexing/test_get_value.py index 65a1c64a1578a..34d94343f6daa 100644 --- a/pandas/tests/frame/indexing/test_get_value.py +++ b/pandas/tests/frame/indexing/test_get_value.py @@ -1,5 +1,5 @@ import pytest - +from enum import Enum from pandas import ( DataFrame, MultiIndex, @@ -20,3 +20,16 @@ def test_get_value(self, float_frame): result = float_frame._get_value(idx, col) expected = float_frame[col][idx] assert result == expected + +def test_enum_value(self,): + Cols = Enum('Cols', 'col1 col2') + + q1 = DataFrame({Cols.col1: [1, 2, 3]}) + q2 = DataFrame({Cols.col1: [1, 2, 3]}) + + result=((q1[Cols.col1] == q2[Cols.col1]).all()) + + expected=True + + assert result == expected + From e0a27b29be46247ab5c2c5c5431fab21a176e8e1 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:27:25 -0700 Subject: [PATCH 02/31] TST --- pandas/tests/frame/indexing/test_get_value.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandas/tests/frame/indexing/test_get_value.py b/pandas/tests/frame/indexing/test_get_value.py index 34d94343f6daa..1d76fe41de25e 100644 --- a/pandas/tests/frame/indexing/test_get_value.py +++ b/pandas/tests/frame/indexing/test_get_value.py @@ -21,15 +21,15 @@ def test_get_value(self, float_frame): expected = float_frame[col][idx] assert result == expected -def test_enum_value(self,): + +def test_enum_value(): Cols = Enum('Cols', 'col1 col2') q1 = DataFrame({Cols.col1: [1, 2, 3]}) q2 = DataFrame({Cols.col1: [1, 2, 3]}) - result=((q1[Cols.col1] == q2[Cols.col1]).all()) - - expected=True + result = ((q1[Cols.col1] == q2[Cols.col1]).all()) - assert result == expected + expected = True + assert result == expected \ No newline at end of file From bd32b97d080fceeeb893370d640a9a316b985fff Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:28:46 -0700 Subject: [PATCH 03/31] TST --- pandas/tests/frame/indexing/test_get_value.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/frame/indexing/test_get_value.py b/pandas/tests/frame/indexing/test_get_value.py index 1d76fe41de25e..3d3223adb8ccf 100644 --- a/pandas/tests/frame/indexing/test_get_value.py +++ b/pandas/tests/frame/indexing/test_get_value.py @@ -32,4 +32,4 @@ def test_enum_value(): expected = True - assert result == expected \ No newline at end of file + assert result == expected From 48a27f82c3142ad71f42ee640f64831981fb3bc2 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:41:16 -0700 Subject: [PATCH 04/31] updated strign formatting --- pandas/tests/frame/indexing/test_get_value.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/tests/frame/indexing/test_get_value.py b/pandas/tests/frame/indexing/test_get_value.py index 3d3223adb8ccf..4a8ca5eabb6ef 100644 --- a/pandas/tests/frame/indexing/test_get_value.py +++ b/pandas/tests/frame/indexing/test_get_value.py @@ -23,12 +23,12 @@ def test_get_value(self, float_frame): def test_enum_value(): - Cols = Enum('Cols', 'col1 col2') + Cols = Enum("Cols", "col1 col2") q1 = DataFrame({Cols.col1: [1, 2, 3]}) q2 = DataFrame({Cols.col1: [1, 2, 3]}) - result = ((q1[Cols.col1] == q2[Cols.col1]).all()) + result = (q1[Cols.col1] == q2[Cols.col1]).all() expected = True From dceccf09fef69a4f3fc54aeb261afd62e5a63cf3 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Wed, 13 Jul 2022 22:28:11 -0700 Subject: [PATCH 05/31] updated formatting --- pandas/tests/frame/indexing/test_get_value.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pandas/tests/frame/indexing/test_get_value.py b/pandas/tests/frame/indexing/test_get_value.py index 4a8ca5eabb6ef..c88977e0ffe24 100644 --- a/pandas/tests/frame/indexing/test_get_value.py +++ b/pandas/tests/frame/indexing/test_get_value.py @@ -1,5 +1,7 @@ -import pytest from enum import Enum + +import pytest + from pandas import ( DataFrame, MultiIndex, From 19040948cc837fe537d6906c1c5df33a323e809e Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 10:43:39 -0700 Subject: [PATCH 06/31] updating the test place within files --- buggy.py | 48 +++++++++++++++++++++++++++ pandas/tests/frame/test_arithmetic.py | 12 +++++++ 2 files changed, 60 insertions(+) create mode 100644 buggy.py diff --git a/buggy.py b/buggy.py new file mode 100644 index 0000000000000..1b78fb0b46c04 --- /dev/null +++ b/buggy.py @@ -0,0 +1,48 @@ +import pandas as pd +import numpy as np +# df = pd.DataFrame({"A": ["1", "", "3"]}, dtype="string") +# try: +# whydontyouwork1 = df.where(df != "", np.nan) +# print(whydontyouwork1) +# arr = whydontyouwork1["A"]._values +# print("arr",arr) +# print("type",type(arr[1])) +# except Exception as e: +# print(e) +# whydontyouwork2=df.where(df != "", np.nan, inplace=True) +# print(whydontyouwork2) +# arr = whydontyouwork2["A"]._values +# print("arr",arr) +# print("type:",type(arr[1])) +################# +# import pandas as pd +# import numpy as np +# df = pd.DataFrame({"HEREITIS": ["1", "", "3"]}, dtype="string") +# df2 = pd.DataFrame({"HEREITIS": ["1", "", "3"]}, dtype="string") +# whydontyouwork1 = df.where(df != "", np.nan) +# print(df2.where(df != "", np.nan, inplace=True)) +# print(whydontyouwork1) +# #print(whydontyouwork2) +################## +# df = pd.DataFrame({"A": ["1", "", "3"]}, dtype="string") +# try: +# result = df.where(df != "", np.nan) +# arr = result["A"]._values +# print(arr) +# print(type(arr[1])) +# except Exception as e: +# print("hi") +# df.where(df != "", np.nan, inplace=True) +# print(df) +# arr = df["A"]._values +# print(arr) +# print(type(arr[1])) +################# +df = pd.DataFrame({"HEREITIS": ["1", "", "3"]}, dtype="string") +df2 = pd.DataFrame({"HEREITIS": ["1", "", "3"]}, dtype="string") + +df2.where(df != "", np.nan, inplace=True) +print(df2) +df = df.where(df != "", np.nan) +print(df) +#print(whydontyouwork2) \ No newline at end of file diff --git a/pandas/tests/frame/test_arithmetic.py b/pandas/tests/frame/test_arithmetic.py index 0864032b741c9..a5517a52b15ab 100644 --- a/pandas/tests/frame/test_arithmetic.py +++ b/pandas/tests/frame/test_arithmetic.py @@ -2050,3 +2050,15 @@ def _constructor_sliced(self): result = sdf + sdf tm.assert_frame_equal(result, expected) + + +def test_enum_column_equality(): + Cols = Enum("Cols", "col1 col2") + + q1 = DataFrame({Cols.col1: [1, 2, 3]}) + q2 = DataFrame({Cols.col1: [1, 2, 3]}) + + result = (q1[Cols.col1] == q2[Cols.col1]) + + expected = True + tm.assert_equal(result, expected) From 7270b34993de64d5fd240e15b2cc22d84e554548 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 10:52:13 -0700 Subject: [PATCH 07/31] removing an additional parentheses --- pandas/tests/frame/test_arithmetic.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandas/tests/frame/test_arithmetic.py b/pandas/tests/frame/test_arithmetic.py index a5517a52b15ab..15820d76d218b 100644 --- a/pandas/tests/frame/test_arithmetic.py +++ b/pandas/tests/frame/test_arithmetic.py @@ -2058,7 +2058,6 @@ def test_enum_column_equality(): q1 = DataFrame({Cols.col1: [1, 2, 3]}) q2 = DataFrame({Cols.col1: [1, 2, 3]}) - result = (q1[Cols.col1] == q2[Cols.col1]) - + result = q1[Cols.col1] == q2[Cols.col1] expected = True tm.assert_equal(result, expected) From 7fb362d06c8f6b3e6b62ec46f426cd0faa95c9ce Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 11:31:57 -0700 Subject: [PATCH 08/31] removing the buggy file that was pushed --- buggy.py | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) delete mode 100644 buggy.py diff --git a/buggy.py b/buggy.py deleted file mode 100644 index 1b78fb0b46c04..0000000000000 --- a/buggy.py +++ /dev/null @@ -1,48 +0,0 @@ -import pandas as pd -import numpy as np -# df = pd.DataFrame({"A": ["1", "", "3"]}, dtype="string") -# try: -# whydontyouwork1 = df.where(df != "", np.nan) -# print(whydontyouwork1) -# arr = whydontyouwork1["A"]._values -# print("arr",arr) -# print("type",type(arr[1])) -# except Exception as e: -# print(e) -# whydontyouwork2=df.where(df != "", np.nan, inplace=True) -# print(whydontyouwork2) -# arr = whydontyouwork2["A"]._values -# print("arr",arr) -# print("type:",type(arr[1])) -################# -# import pandas as pd -# import numpy as np -# df = pd.DataFrame({"HEREITIS": ["1", "", "3"]}, dtype="string") -# df2 = pd.DataFrame({"HEREITIS": ["1", "", "3"]}, dtype="string") -# whydontyouwork1 = df.where(df != "", np.nan) -# print(df2.where(df != "", np.nan, inplace=True)) -# print(whydontyouwork1) -# #print(whydontyouwork2) -################## -# df = pd.DataFrame({"A": ["1", "", "3"]}, dtype="string") -# try: -# result = df.where(df != "", np.nan) -# arr = result["A"]._values -# print(arr) -# print(type(arr[1])) -# except Exception as e: -# print("hi") -# df.where(df != "", np.nan, inplace=True) -# print(df) -# arr = df["A"]._values -# print(arr) -# print(type(arr[1])) -################# -df = pd.DataFrame({"HEREITIS": ["1", "", "3"]}, dtype="string") -df2 = pd.DataFrame({"HEREITIS": ["1", "", "3"]}, dtype="string") - -df2.where(df != "", np.nan, inplace=True) -print(df2) -df = df.where(df != "", np.nan) -print(df) -#print(whydontyouwork2) \ No newline at end of file From e48a63d704d57c6b22773de4b092e0370a8ab60a Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 11:44:52 -0700 Subject: [PATCH 09/31] removing the buggy file that was pushed --- pandas/tests/frame/test_arithmetic.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/tests/frame/test_arithmetic.py b/pandas/tests/frame/test_arithmetic.py index 15820d76d218b..4b01deba0fbda 100644 --- a/pandas/tests/frame/test_arithmetic.py +++ b/pandas/tests/frame/test_arithmetic.py @@ -1,3 +1,4 @@ +from enum import Enum from collections import deque from datetime import datetime import functools From 15be2f56483aa5cc9beb108a721f77c9ef6c080c Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 11:51:26 -0700 Subject: [PATCH 10/31] fixing initial file --- pandas/tests/frame/indexing/test_get_value.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/pandas/tests/frame/indexing/test_get_value.py b/pandas/tests/frame/indexing/test_get_value.py index c88977e0ffe24..34c84208a5b12 100644 --- a/pandas/tests/frame/indexing/test_get_value.py +++ b/pandas/tests/frame/indexing/test_get_value.py @@ -1,5 +1,3 @@ -from enum import Enum - import pytest from pandas import ( @@ -21,17 +19,4 @@ def test_get_value(self, float_frame): for col in float_frame.columns: result = float_frame._get_value(idx, col) expected = float_frame[col][idx] - assert result == expected - - -def test_enum_value(): - Cols = Enum("Cols", "col1 col2") - - q1 = DataFrame({Cols.col1: [1, 2, 3]}) - q2 = DataFrame({Cols.col1: [1, 2, 3]}) - - result = (q1[Cols.col1] == q2[Cols.col1]).all() - - expected = True - - assert result == expected + assert result == expected \ No newline at end of file From 204affbcc88aee53ea4770261b895763581b32b9 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 12:06:33 -0700 Subject: [PATCH 11/31] fixing order of import --- pandas/tests/frame/indexing/test_get_value.py | 1 + pandas/tests/frame/test_arithmetic.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/tests/frame/indexing/test_get_value.py b/pandas/tests/frame/indexing/test_get_value.py index 34c84208a5b12..a1538dd4c06b0 100644 --- a/pandas/tests/frame/indexing/test_get_value.py +++ b/pandas/tests/frame/indexing/test_get_value.py @@ -19,4 +19,5 @@ def test_get_value(self, float_frame): for col in float_frame.columns: result = float_frame._get_value(idx, col) expected = float_frame[col][idx] + assert result == expected \ No newline at end of file diff --git a/pandas/tests/frame/test_arithmetic.py b/pandas/tests/frame/test_arithmetic.py index 4b01deba0fbda..d14914dd5453f 100644 --- a/pandas/tests/frame/test_arithmetic.py +++ b/pandas/tests/frame/test_arithmetic.py @@ -1,6 +1,6 @@ -from enum import Enum from collections import deque from datetime import datetime +from enum import Enum import functools import operator import re From 22843cc4a7c3b463ef6f30830c0367b79dff93d9 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 12:29:25 -0700 Subject: [PATCH 12/31] fixing space --- pandas/tests/frame/indexing/test_get_value.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/tests/frame/indexing/test_get_value.py b/pandas/tests/frame/indexing/test_get_value.py index a1538dd4c06b0..ebb12c97b2eeb 100644 --- a/pandas/tests/frame/indexing/test_get_value.py +++ b/pandas/tests/frame/indexing/test_get_value.py @@ -19,5 +19,6 @@ def test_get_value(self, float_frame): for col in float_frame.columns: result = float_frame._get_value(idx, col) expected = float_frame[col][idx] + assert result == expected \ No newline at end of file From d1d060191242faadcffefab598411ba397962da7 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 12:38:12 -0700 Subject: [PATCH 13/31] fixing space --- pandas/tests/frame/indexing/test_get_value.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandas/tests/frame/indexing/test_get_value.py b/pandas/tests/frame/indexing/test_get_value.py index ebb12c97b2eeb..a2e0c4d8fb405 100644 --- a/pandas/tests/frame/indexing/test_get_value.py +++ b/pandas/tests/frame/indexing/test_get_value.py @@ -19,6 +19,5 @@ def test_get_value(self, float_frame): for col in float_frame.columns: result = float_frame._get_value(idx, col) expected = float_frame[col][idx] - - assert result == expected \ No newline at end of file + assert result == expected From c795d5d963c5c0b8e3025d94e29d9b1869c24333 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 12:50:17 -0700 Subject: [PATCH 14/31] fixing space --- pandas/tests/frame/indexing/test_get_value.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/tests/frame/indexing/test_get_value.py b/pandas/tests/frame/indexing/test_get_value.py index a2e0c4d8fb405..65a1c64a1578a 100644 --- a/pandas/tests/frame/indexing/test_get_value.py +++ b/pandas/tests/frame/indexing/test_get_value.py @@ -19,5 +19,4 @@ def test_get_value(self, float_frame): for col in float_frame.columns: result = float_frame._get_value(idx, col) expected = float_frame[col][idx] - assert result == expected From da73d0ec54834c9650ab4756ea3ff0c0b96bc1d4 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Tue, 19 Jul 2022 17:07:19 -0700 Subject: [PATCH 15/31] issue2 --- pandas/core/generic.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index e392802bdb5ea..a6ebaa346b361 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -9495,6 +9495,11 @@ def _where( self._check_inplace_setting(other) new_data = self._mgr.putmask(mask=cond, new=other, align=align) result = self._constructor(new_data) + for i in range(len(result.dtypes)): + if result.dtypes[i] != 'object': + result[result.columns[i]] = ( + result[result.columns[i]].convert_dtypes() + ) return self._update_inplace(result) else: From d002ce08eb7c4f35b06c636ec234f31f7707685c Mon Sep 17 00:00:00 2001 From: Shaghayegh <93452403+Shadimrad@users.noreply.github.com> Date: Tue, 19 Jul 2022 17:09:50 -0700 Subject: [PATCH 16/31] Update test_arithmetic.py --- pandas/tests/frame/test_arithmetic.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/tests/frame/test_arithmetic.py b/pandas/tests/frame/test_arithmetic.py index 43707f22eb4eb..25257a2c102fd 100644 --- a/pandas/tests/frame/test_arithmetic.py +++ b/pandas/tests/frame/test_arithmetic.py @@ -2063,4 +2063,3 @@ def test_enum_column_equality(): expected = Series([True, True, True], name=Cols.col1) tm.assert_series_equal(result, expected) - From a8146e9d9ec54ce3b37e2d0c34e040843790ed06 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Tue, 19 Jul 2022 18:53:34 -0700 Subject: [PATCH 17/31] test --- pandas/tests/frame/indexing/test_where.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 5b9883f3866e7..6e1bf0774ed12 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -1049,3 +1049,10 @@ def test_where_mask_deprecated(frame_or_series): with tm.assert_produces_warning(FutureWarning): obj.mask(mask, -1, errors="raise") + +def test_consitency_inplace(): + df = pd.DataFrame({"M": [""]}, dtype="string") + df2 = pd.DataFrame({"M": [""]}, dtype="string") + df2.where(df2 != "", np.nan, inplace=True) + df = df.where(df != "", np.nan) + tm.assert_frame_equal(df,df2) \ No newline at end of file From 1d3e9142949facc55169c72c3bbc5e6eb91b2d1f Mon Sep 17 00:00:00 2001 From: Shaghayegh <93452403+Shadimrad@users.noreply.github.com> Date: Tue, 19 Jul 2022 19:16:54 -0700 Subject: [PATCH 18/31] Update test_where.py --- pandas/tests/frame/indexing/test_where.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 6e1bf0774ed12..04f2cddac300e 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -1055,4 +1055,4 @@ def test_consitency_inplace(): df2 = pd.DataFrame({"M": [""]}, dtype="string") df2.where(df2 != "", np.nan, inplace=True) df = df.where(df != "", np.nan) - tm.assert_frame_equal(df,df2) \ No newline at end of file + tm.assert_frame_equal(df,df2) From e92bb7c92d326753f954c3df2153fee903341677 Mon Sep 17 00:00:00 2001 From: Shaghayegh <93452403+Shadimrad@users.noreply.github.com> Date: Tue, 19 Jul 2022 20:31:02 -0700 Subject: [PATCH 19/31] Update test_where.py --- pandas/tests/frame/indexing/test_where.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 04f2cddac300e..6670115503c6d 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -1055,4 +1055,5 @@ def test_consitency_inplace(): df2 = pd.DataFrame({"M": [""]}, dtype="string") df2.where(df2 != "", np.nan, inplace=True) df = df.where(df != "", np.nan) + tm.assert_frame_equal(df,df2) From 6d446f9a5142925df7f2ab23dc0d5a6815bec1f5 Mon Sep 17 00:00:00 2001 From: Shaghayegh <93452403+Shadimrad@users.noreply.github.com> Date: Tue, 19 Jul 2022 20:34:46 -0700 Subject: [PATCH 20/31] Update generic.py --- pandas/core/generic.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 885462e1cb317..bba48f7ff5380 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -9499,12 +9499,7 @@ def _where( self._check_inplace_setting(other) new_data = self._mgr.putmask(mask=cond, new=other, align=align) - result = self._constructor(new_data) - for i in range(len(result.dtypes)): - if result.dtypes[i] != 'object': - result[result.columns[i]] = ( - result[result.columns[i]].convert_dtypes() - ) + result = self._constructor(new_data) return self._update_inplace(result) else: From 8d6009742b3d37be0de26746d5877424023331df Mon Sep 17 00:00:00 2001 From: Shaghayegh <93452403+Shadimrad@users.noreply.github.com> Date: Tue, 19 Jul 2022 20:35:58 -0700 Subject: [PATCH 21/31] Update generic.py --- pandas/core/generic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index bba48f7ff5380..602e92ed0ec77 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -9499,7 +9499,7 @@ def _where( self._check_inplace_setting(other) new_data = self._mgr.putmask(mask=cond, new=other, align=align) - result = self._constructor(new_data) + result = self._constructor(new_data) return self._update_inplace(result) else: From 007612f91183b4384df1c83dbc1270bf0d84b15c Mon Sep 17 00:00:00 2001 From: Shaghayegh <93452403+Shadimrad@users.noreply.github.com> Date: Tue, 19 Jul 2022 20:37:10 -0700 Subject: [PATCH 22/31] Update generic.py --- pandas/core/generic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 602e92ed0ec77..0a439faed0896 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -9499,7 +9499,7 @@ def _where( self._check_inplace_setting(other) new_data = self._mgr.putmask(mask=cond, new=other, align=align) - result = self._constructor(new_data) + result = self._constructor(new_data) return self._update_inplace(result) else: From c655774292e821a1ad24454f3d588a7f2fca14dc Mon Sep 17 00:00:00 2001 From: Shaghayegh <93452403+Shadimrad@users.noreply.github.com> Date: Tue, 19 Jul 2022 21:30:56 -0700 Subject: [PATCH 23/31] Update test_where.py --- pandas/tests/frame/indexing/test_where.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 6670115503c6d..80d01834c6391 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -1056,4 +1056,5 @@ def test_consitency_inplace(): df2.where(df2 != "", np.nan, inplace=True) df = df.where(df != "", np.nan) + tm.assert_frame_equal(df,df2) From 7cf318a97754cd64ffff490e5e0540e8e4895634 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Tue, 19 Jul 2022 18:53:34 -0700 Subject: [PATCH 24/31] test --- pandas/tests/frame/indexing/test_where.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 5b9883f3866e7..6e1bf0774ed12 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -1049,3 +1049,10 @@ def test_where_mask_deprecated(frame_or_series): with tm.assert_produces_warning(FutureWarning): obj.mask(mask, -1, errors="raise") + +def test_consitency_inplace(): + df = pd.DataFrame({"M": [""]}, dtype="string") + df2 = pd.DataFrame({"M": [""]}, dtype="string") + df2.where(df2 != "", np.nan, inplace=True) + df = df.where(df != "", np.nan) + tm.assert_frame_equal(df,df2) \ No newline at end of file From 345278335d0477a4d9d9772bac56288cf0242d39 Mon Sep 17 00:00:00 2001 From: Shaghayegh <93452403+Shadimrad@users.noreply.github.com> Date: Thu, 4 Aug 2022 00:21:04 -0700 Subject: [PATCH 25/31] Update test_where.py --- pandas/tests/frame/indexing/test_where.py | 61 ++++++++++++++++++++--- 1 file changed, 53 insertions(+), 8 deletions(-) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 80d01834c6391..693f52806d0f8 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -1049,12 +1049,57 @@ def test_where_mask_deprecated(frame_or_series): with tm.assert_produces_warning(FutureWarning): obj.mask(mask, -1, errors="raise") + +@pytest.mark.parametrize( + "arg, arg2", + [ + [ + { + "a": np.random.randint(10, size=10), + "b": pd.date_range("20010101", periods=10), + }, + { + "a": np.random.randint(10, size=10), + "b": np.random.randint(10, size=10), + }, + ], + [ + { + "a": np.random.randint(10, size=10), + "b": np.random.randint(10, size=10), + }, + { + "a": np.random.randint(10, size=10), + "b": pd.date_range("20010101", periods=10), + }, + ], + [ + { + "a": pd.date_range("20010101", periods=10), + "b": pd.date_range("20010101", periods=10), + }, + { + "a": np.random.randint(10, size=10), + "b": np.random.randint(10, size=10), + }, + ], + [ + { + "a": np.random.randint(10, size=10), + "b": pd.date_range("20010101", periods=10), + }, + { + "a": pd.date_range("20010101", periods=10), + "b": pd.date_range("20010101", periods=10), + }, + ], + ], + ) + def test_consitency_inplace(): + df = pd.DataFrame({"M": [""]}, dtype="string") + df2 = pd.DataFrame({"M": [""]}, dtype="string") + df2.where(df2 != "", np.nan, inplace=True) + df = df.where(df != "", np.nan) + -def test_consitency_inplace(): - df = pd.DataFrame({"M": [""]}, dtype="string") - df2 = pd.DataFrame({"M": [""]}, dtype="string") - df2.where(df2 != "", np.nan, inplace=True) - df = df.where(df != "", np.nan) - - - tm.assert_frame_equal(df,df2) + tm.assert_frame_equal(df,df2) From bcdff675da6d87144ee624c1372df51a61f42df8 Mon Sep 17 00:00:00 2001 From: Shaghayegh <93452403+Shadimrad@users.noreply.github.com> Date: Thu, 4 Aug 2022 00:27:12 -0700 Subject: [PATCH 26/31] Update test_where.py --- pandas/tests/frame/indexing/test_where.py | 54 ----------------------- 1 file changed, 54 deletions(-) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 693f52806d0f8..5b9883f3866e7 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -1049,57 +1049,3 @@ def test_where_mask_deprecated(frame_or_series): with tm.assert_produces_warning(FutureWarning): obj.mask(mask, -1, errors="raise") - -@pytest.mark.parametrize( - "arg, arg2", - [ - [ - { - "a": np.random.randint(10, size=10), - "b": pd.date_range("20010101", periods=10), - }, - { - "a": np.random.randint(10, size=10), - "b": np.random.randint(10, size=10), - }, - ], - [ - { - "a": np.random.randint(10, size=10), - "b": np.random.randint(10, size=10), - }, - { - "a": np.random.randint(10, size=10), - "b": pd.date_range("20010101", periods=10), - }, - ], - [ - { - "a": pd.date_range("20010101", periods=10), - "b": pd.date_range("20010101", periods=10), - }, - { - "a": np.random.randint(10, size=10), - "b": np.random.randint(10, size=10), - }, - ], - [ - { - "a": np.random.randint(10, size=10), - "b": pd.date_range("20010101", periods=10), - }, - { - "a": pd.date_range("20010101", periods=10), - "b": pd.date_range("20010101", periods=10), - }, - ], - ], - ) - def test_consitency_inplace(): - df = pd.DataFrame({"M": [""]}, dtype="string") - df2 = pd.DataFrame({"M": [""]}, dtype="string") - df2.where(df2 != "", np.nan, inplace=True) - df = df.where(df != "", np.nan) - - - tm.assert_frame_equal(df,df2) From ca7a7058e1073faeae63301c78e115d95bee37fc Mon Sep 17 00:00:00 2001 From: Shaghayegh <93452403+Shadimrad@users.noreply.github.com> Date: Thu, 4 Aug 2022 00:42:42 -0700 Subject: [PATCH 27/31] Update test_where.py --- pandas/tests/frame/indexing/test_where.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 6e1bf0774ed12..04f2cddac300e 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -1055,4 +1055,4 @@ def test_consitency_inplace(): df2 = pd.DataFrame({"M": [""]}, dtype="string") df2.where(df2 != "", np.nan, inplace=True) df = df.where(df != "", np.nan) - tm.assert_frame_equal(df,df2) \ No newline at end of file + tm.assert_frame_equal(df,df2) From 4e9b374f10a4f5ef0a4318157d1cef056c986a84 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Thu, 4 Aug 2022 00:43:49 -0700 Subject: [PATCH 28/31] do --- pandas/tests/strings/test_strings.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pandas/tests/strings/test_strings.py b/pandas/tests/strings/test_strings.py index 0e55676699c21..abddb93174663 100644 --- a/pandas/tests/strings/test_strings.py +++ b/pandas/tests/strings/test_strings.py @@ -828,3 +828,12 @@ def test_zfill_with_leading_sign(): value = Series(["-cat", "-1", "+dog"]) expected = Series(["-0cat", "-0001", "+0dog"]) tm.assert_series_equal(value.str.zfill(5), expected) + + +def test_consitency_inplace(): + df = DataFrame({"M": [""]}, dtype="string") + df2 = DataFrame({"M": [""]}, dtype="string") + df2.where(df2 != "", np.nan, inplace=True) + df = df.where(df != "", np.nan) + + tm.assert_frame_equal(df, df2) From b78896f4332a55e44da5ccbe79815cf9db5a53a1 Mon Sep 17 00:00:00 2001 From: Shaghayegh <93452403+Shadimrad@users.noreply.github.com> Date: Thu, 4 Aug 2022 00:47:25 -0700 Subject: [PATCH 29/31] Update test_where.py --- pandas/tests/frame/indexing/test_where.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 04f2cddac300e..5b9883f3866e7 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -1049,10 +1049,3 @@ def test_where_mask_deprecated(frame_or_series): with tm.assert_produces_warning(FutureWarning): obj.mask(mask, -1, errors="raise") - -def test_consitency_inplace(): - df = pd.DataFrame({"M": [""]}, dtype="string") - df2 = pd.DataFrame({"M": [""]}, dtype="string") - df2.where(df2 != "", np.nan, inplace=True) - df = df.where(df != "", np.nan) - tm.assert_frame_equal(df,df2) From 86b6b9add3d44fb23055484ae492e2deb46f43e6 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Thu, 4 Aug 2022 01:02:33 -0700 Subject: [PATCH 30/31] relocate --- pandas/tests/arrays/string_/test_string.py | 8 ++++++++ pandas/tests/strings/test_strings.py | 9 --------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pandas/tests/arrays/string_/test_string.py b/pandas/tests/arrays/string_/test_string.py index 4376a0de37a8c..a571171960e2f 100644 --- a/pandas/tests/arrays/string_/test_string.py +++ b/pandas/tests/arrays/string_/test_string.py @@ -608,3 +608,11 @@ def test_setitem_scalar_with_mask_validation(dtype): msg = "Scalar must be NA or str" with pytest.raises(ValueError, match=msg): ser[mask] = 1 + + +def test_consitency_inplace(): + df = pd.DataFrame({"M": [""]}, dtype="string") + df2 = pd.DataFrame({"M": [""]}, dtype="string") + df2.where(df2 != "", np.nan, inplace=True) + df = df.where(df != "", np.nan) + tm.assert_frame_equal(df, df2) diff --git a/pandas/tests/strings/test_strings.py b/pandas/tests/strings/test_strings.py index abddb93174663..0e55676699c21 100644 --- a/pandas/tests/strings/test_strings.py +++ b/pandas/tests/strings/test_strings.py @@ -828,12 +828,3 @@ def test_zfill_with_leading_sign(): value = Series(["-cat", "-1", "+dog"]) expected = Series(["-0cat", "-0001", "+0dog"]) tm.assert_series_equal(value.str.zfill(5), expected) - - -def test_consitency_inplace(): - df = DataFrame({"M": [""]}, dtype="string") - df2 = DataFrame({"M": [""]}, dtype="string") - df2.where(df2 != "", np.nan, inplace=True) - df = df.where(df != "", np.nan) - - tm.assert_frame_equal(df, df2) From d4ec9b507ea047c0bf95d90042790b6bea10ae6e Mon Sep 17 00:00:00 2001 From: Shaghayegh <93452403+Shadimrad@users.noreply.github.com> Date: Thu, 18 Aug 2022 16:34:22 -0700 Subject: [PATCH 31/31] Update test_string.py --- pandas/tests/arrays/string_/test_string.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandas/tests/arrays/string_/test_string.py b/pandas/tests/arrays/string_/test_string.py index 5cac852b40496..5b4d586e69c1b 100644 --- a/pandas/tests/arrays/string_/test_string.py +++ b/pandas/tests/arrays/string_/test_string.py @@ -614,8 +614,8 @@ def test_setitem_scalar_with_mask_validation(dtype): def test_consitency_inplace(): + expected = pd.DataFrame({"M": [""]}, dtype="string") df = pd.DataFrame({"M": [""]}, dtype="string") - df2 = pd.DataFrame({"M": [""]}, dtype="string") - df2.where(df2 != "", np.nan, inplace=True) - df = df.where(df != "", np.nan) - tm.assert_frame_equal(df, df2) + df.where(df != "", np.nan, inplace=True) + expected = expected.where(expected != "", np.nan) + tm.assert_frame_equal(expected, df)