required changes done

Author: ramvikrams

pandas/conftest.py

@@ -139,8 +139,8 @@ def pytest_collection_modifyitems(items, config) -> None:
  ("missing.mask_zero_div_zero", "divide by zero encountered"),
  (
  "pandas.core.generic.NDFrame.bool",
- "NDFrame.bool is now deprecated and will be removed in future releases "
- "and cases that relied on it will raise in a future version",
+ "NDFrame.bool is now deprecated and will be removed in future version of pandas "
+ "and cases that relied on it will raise a future warning",
  ),
  ]
 

pandas/core/generic.py

@@ -1503,8 +1503,8 @@ def bool(self) -> bool_t:
  """
 
  warnings.warn(
- "NDFrame.bool is now deprecated and will be removed in future releases "
- "and cases that relied on it will raise in a future version",
+ "type(self).__name__ is now deprecated and will be removed in future "
+ "version of pandas and cases that relied on it will raise a future warning",
  FutureWarning,
  stacklevel=find_stack_level(),
  )

pandas/tests/generic/test_frame.py

@@ -48,15 +48,15 @@ def test_set_axis_name_mi(self, func):
  def test_nonzero_single_element(self):
  # allow single item via bool method
  msg = (
- "NDFrame.bool is now deprecated and will be removed in future releases "
- "and cases that relied on it will raise in a future version"
+ "NDFrame.bool is now deprecated and will be removed in future version of pandas "
+ "and cases that relied on it will raise a future warning"
  )
- with tm.assert_produces_warning(FutureWarning, match=msg):
- df = DataFrame([[True]])
+ df = DataFrame([[True]])
+ df1 = DataFrame([[False]])
+ while tm.assert_produces_warning(FutureWarning, match=msg):
  assert df.bool()
 
- df = DataFrame([[False]])
- assert not df.bool()
+ assert not df1.bool()
 
  df = DataFrame([[False, False]])
  msg = "The truth value of a DataFrame is ambiguous"

pandas/tests/generic/test_generic.py

@@ -444,8 +444,8 @@ def test_flags_identity(self, frame_or_series):
 
  def test_bool_dep(self) -> None:
  msg = (
- "NDFrame.bool is now deprecated and will be removed in future releases "
- "and cases that relied on it will raise in a future version"
+ "NDFrame.bool is now deprecated and will be removed in future version of pandas "
+ "and cases that relied on it will raise a future warning"
  )
  with tm.assert_produces_warning(FutureWarning, match=msg):
  DataFrame({"col": [False]}).bool()

pandas/tests/generic/test_series.py

@@ -42,15 +42,15 @@ def test_get_bool_data_preserve_dtype(self):
  def test_nonzero_single_element(self):
  # allow single item via bool method
  msg = (
- "NDFrame.bool is now deprecated and will be removed in future releases "
- "and cases that relied on it will raise in a future version"
+ "NDFrame.bool is now deprecated and will be removed in future version of pandas "
+ "and cases that relied on it will raise a future warning"
  )
- with tm.assert_produces_warning(FutureWarning, match=msg):
- ser = Series([True])
+ ser = Series([True])
+ ser1 = Series([False])
+ while tm.assert_produces_warning(FutureWarning, match=msg):
  assert ser.bool()
 
- ser = Series([False])
- assert not ser.bool()
+ assert not ser1.bool()
 
  @pytest.mark.parametrize("data", [np.nan, pd.NaT, True, False])
  def test_nonzero_single_element_raise_1(self, data):
@@ -64,12 +64,11 @@ def test_nonzero_single_element_raise_1(self, data):
  @pytest.mark.parametrize("data", [np.nan, pd.NaT])
  def test_nonzero_single_element_raise_2(self, data):
  msg = (
- "NDFrame.bool is now deprecated and will be removed in future releases "
- "and cases that relied on it will raise in a future version"
+ "NDFrame.bool is now deprecated and will be removed in future version of pandas "
+ "and cases that relied on it will raise a future warning"
  )
- with tm.assert_produces_warning(FutureWarning, match=msg):
- series = Series([data])
-
+ series = Series([data])
+ while tm.assert_produces_warning(FutureWarning, match=msg):
  msg = "bool cannot act on a non-boolean single element Series"
  with pytest.raises(ValueError, match=msg):
  series.bool()
@@ -78,12 +77,11 @@ def test_nonzero_single_element_raise_2(self, data):
  def test_nonzero_multiple_element_raise(self, data):
  # multiple bool are still an error
  msg = (
- "NDFrame.bool is now deprecated and will be removed in future releases "
- "and cases that relied on it will raise in a future version"
+ "NDFrame.bool is now deprecated and will be removed in future version of pandas "
+ "and cases that relied on it will raise a future warning"
  )
- with tm.assert_produces_warning(FutureWarning, match=msg):
- series = Series([data])
-
+ series = Series([data])
+ while tm.assert_produces_warning(FutureWarning, match=msg):
  msg = "The truth value of a Series is ambiguous"
  with pytest.raises(ValueError, match=msg):
  bool(series)
@@ -94,8 +92,8 @@ def test_nonzero_multiple_element_raise(self, data):
  def test_nonbool_single_element_raise(self, data):
  # single non-bool are an error
  msg = (
- "NDFrame.bool is now deprecated and will be removed in future releases "
- "and cases that relied on it will raise in a future version"
+ "NDFrame.bool is now deprecated and will be removed in future version of pandas "
+ "and cases that relied on it will raise a future warning"
  )
  with tm.assert_produces_warning(FutureWarning, match=msg):
  series = Series([data])

pandas/tests/window/test_timeseries_window.py

@@ -506,18 +506,14 @@ def test_perf_min(self):
  dfp = DataFrame(
  {"B": np.random.randn(N)}, index=date_range("20130101", periods=N, freq="s")
  )
- msg = (
- "NDFrame.bool is now deprecated and will be removed in future releases "
- "and cases that relied on it will raise in a future version"
- )
- with tm.assert_produces_warning(FutureWarning, match=msg):
- expected = dfp.rolling(2, min_periods=1).min()
- result = dfp.rolling("2s").min()
- assert ((result - expected) < 0.01).all().bool()
-
- expected = dfp.rolling(200, min_periods=1).min()
- result = dfp.rolling("200s").min()
- assert ((result - expected) < 0.01).all().bool()
+
+ expected = dfp.rolling(2, min_periods=1).min()
+ result = dfp.rolling("2s").min()
+ assert ((result - expected) < 0.01).all() == True
+
+ expected = dfp.rolling(200, min_periods=1).min()
+ result = dfp.rolling("200s").min()
+ assert ((result - expected) < 0.01).all() == True
 
  def test_ragged_max(self, ragged):
  df = ragged