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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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 f78ef3b9a83d44be110a47164b46b6d2607ab76f Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 14:53:44 -0700 Subject: [PATCH 15/19] series --- pandas/tests/frame/indexing/test_where.py | 8 ++++++++ pandas/tests/frame/test_arithmetic.py | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 9d004613116b8..0abb3c226b4b0 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -1035,3 +1035,11 @@ def test_where_dt64_2d(): mask[:] = True expected = df _check_where_equivalences(df, mask, other, expected) + +def test_where_inplace_true(): + df = pd.DataFrame({"HEREITIS": ["1", "", "3"]}, dtype="string") + df2 = pd.DataFrame({"HEREITIS": ["1", "", "3"]}, dtype="string") + + df2.where(df != "", np.nan, inplace=True) + df = df.where(df != "", np.nan) + tm.assert_frame_equal(df, df2) \ No newline at end of file diff --git a/pandas/tests/frame/test_arithmetic.py b/pandas/tests/frame/test_arithmetic.py index d14914dd5453f..78fbac774545e 100644 --- a/pandas/tests/frame/test_arithmetic.py +++ b/pandas/tests/frame/test_arithmetic.py @@ -2060,5 +2060,7 @@ def test_enum_column_equality(): q2 = DataFrame({Cols.col1: [1, 2, 3]}) result = q1[Cols.col1] == q2[Cols.col1] - expected = True + data = np.array([True, True, True]) + expected = pd.Series(data) + tm.assert_equal(result, expected) From 2b22f4abef3e59732e94e6d2287f48e6a4475295 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 14:56:59 -0700 Subject: [PATCH 16/19] series --- pandas/tests/frame/indexing/test_where.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 0abb3c226b4b0..9d004613116b8 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -1035,11 +1035,3 @@ def test_where_dt64_2d(): mask[:] = True expected = df _check_where_equivalences(df, mask, other, expected) - -def test_where_inplace_true(): - df = pd.DataFrame({"HEREITIS": ["1", "", "3"]}, dtype="string") - df2 = pd.DataFrame({"HEREITIS": ["1", "", "3"]}, dtype="string") - - df2.where(df != "", np.nan, inplace=True) - df = df.where(df != "", np.nan) - tm.assert_frame_equal(df, df2) \ No newline at end of file From f00dcb9084afe94d42e7c22549f7b144cf7c5dcf Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 15:33:12 -0700 Subject: [PATCH 17/19] series --- pandas/tests/frame/test_arithmetic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/frame/test_arithmetic.py b/pandas/tests/frame/test_arithmetic.py index 78fbac774545e..2f0d4f5ea7781 100644 --- a/pandas/tests/frame/test_arithmetic.py +++ b/pandas/tests/frame/test_arithmetic.py @@ -2063,4 +2063,4 @@ def test_enum_column_equality(): data = np.array([True, True, True]) expected = pd.Series(data) - tm.assert_equal(result, expected) + tm.assert_series_equal(result, expected) From 53dba67ce56b0650c6709d47dc94b6c44b558c8f Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 15:57:34 -0700 Subject: [PATCH 18/19] series --- pandas/tests/frame/test_arithmetic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/frame/test_arithmetic.py b/pandas/tests/frame/test_arithmetic.py index 2f0d4f5ea7781..e17991ecdb392 100644 --- a/pandas/tests/frame/test_arithmetic.py +++ b/pandas/tests/frame/test_arithmetic.py @@ -2061,6 +2061,6 @@ def test_enum_column_equality(): result = q1[Cols.col1] == q2[Cols.col1] data = np.array([True, True, True]) - expected = pd.Series(data) + expected = Series(data) tm.assert_series_equal(result, expected) From f413e942423a0dd1e00c3e6d0659b8cd4aa62d85 Mon Sep 17 00:00:00 2001 From: potato <93452403+Shadimrad@users.noreply.github.com> Date: Fri, 15 Jul 2022 16:47:41 -0700 Subject: [PATCH 19/19] syntax --- 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 e17991ecdb392..25257a2c102fd 100644 --- a/pandas/tests/frame/test_arithmetic.py +++ b/pandas/tests/frame/test_arithmetic.py @@ -2060,7 +2060,6 @@ def test_enum_column_equality(): q2 = DataFrame({Cols.col1: [1, 2, 3]}) result = q1[Cols.col1] == q2[Cols.col1] - data = np.array([True, True, True]) - expected = Series(data) + expected = Series([True, True, True], name=Cols.col1) tm.assert_series_equal(result, expected)