Merge branch 'main' into #29049_make_holiday_support_offsets_of_offsets

Author: dontgoto

pandas/tests/plotting/frame/test_frame_subplots.py

@@ -187,9 +187,9 @@ def test_subplots_timeseries_y_axis_not_supported(self):
  data = {
  "numeric": np.array([1, 2, 5]),
  "period": [
- pd.Period("2017-08-01 00:00:00", freq="H"),
- pd.Period("2017-08-01 02:00", freq="H"),
- pd.Period("2017-08-02 00:00:00", freq="H"),
+ pd.Period("2017-08-01 00:00:00", freq="h"),
+ pd.Period("2017-08-01 02:00", freq="h"),
+ pd.Period("2017-08-02 00:00:00", freq="h"),
  ],
  "categorical": pd.Categorical(
  ["c", "b", "a"], categories=["a", "b", "c"], ordered=False

pandas/tests/plotting/test_datetimelike.py

@@ -927,7 +927,7 @@ def test_mixed_freq_shared_ax_twin_x(self):
  @pytest.mark.xfail(reason="TODO (GH14330, GH14322)")
  def test_mixed_freq_shared_ax_twin_x_irregular_first(self):
  # GH13341, using sharex=True
- idx1 = date_range("2015-01-01", periods=3, freq="M")
+ idx1 = date_range("2015-01-01", periods=3, freq="ME")
  idx2 = idx1[:1].union(idx1[2:])
  s1 = Series(range(len(idx1)), idx1)
  s2 = Series(range(len(idx2)), idx2)