Merge branch 'main' into fix/#61636

heoh · web-flow · commit fa31d07e9dbf · 2025-06-24T07:53:13.000+09:00
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -114,6 +114,8 @@
                 ):
                     exclude_patterns.append(rel_fname)
                 elif single_doc and rel_fname != pattern:
+                    if "\\" in rel_fname:
+                        rel_fname = rel_fname.replace("\\", "/")
                     exclude_patterns.append(rel_fname)
 
 with open(os.path.join(source_path, "index.rst.template"), encoding="utf-8") as f:
diff --git a/doc/source/development/community.rst b/doc/source/development/community.rst
@@ -77,7 +77,7 @@ Any community member can open issues to:
 - Ask questions, e.g. "I noticed the behavior of a certain function
   changed between versions. Is this expected?".
 
-    Ideally, your questions should be related to how pandas works rather
+  - Ideally, your questions should be related to how pandas works rather
     than how you use pandas. `StackOverflow <https://stackoverflow.com/>`_ is
     better suited for answering usage questions, and we ask that all usage
     questions are first asked on StackOverflow. Thank you for respecting our
diff --git a/doc/source/development/contributing.rst b/doc/source/development/contributing.rst
@@ -234,14 +234,14 @@ and merged into project to appear the in the next release. To submit a pull requ
 #. Write a descriptive title that includes prefixes. pandas uses a convention for title
    prefixes. Here are some common ones along with general guidelines for when to use them:
 
-    * ENH: Enhancement, new functionality
-    * BUG: Bug fix
-    * DOC: Additions/updates to documentation
-    * TST: Additions/updates to tests
-    * BLD: Updates to the build process/scripts
-    * PERF: Performance improvement
-    * TYP: Type annotations
-    * CLN: Code cleanup
+   * ENH: Enhancement, new functionality
+   * BUG: Bug fix
+   * DOC: Additions/updates to documentation
+   * TST: Additions/updates to tests
+   * BLD: Updates to the build process/scripts
+   * PERF: Performance improvement
+   * TYP: Type annotations
+   * CLN: Code cleanup
 
 #. Write a description of your changes in the ``Preview Discussion`` tab
 #. Click ``Send Pull Request``.
diff --git a/doc/source/development/contributing_codebase.rst b/doc/source/development/contributing_codebase.rst
@@ -444,11 +444,11 @@ be located.
                result = ser.loc[[3, 4]]
                tm.assert_series_equal(result, expected)
 
-    In cases like this, the test location should be based on the *underlying*
-    method being tested.  Or in the case of a test for a bugfix, the location
-    of the actual bug.  So in this example, we know that ``Series.__getitem__``
-    calls ``Series.loc.__getitem__``, so this is *really* a test for
-    ``loc.__getitem__``.  So this test belongs in ``tests.indexing.test_loc``.
+      In cases like this, the test location should be based on the *underlying*
+      method being tested.  Or in the case of a test for a bugfix, the location
+      of the actual bug.  So in this example, we know that ``Series.__getitem__``
+      calls ``Series.loc.__getitem__``, so this is *really* a test for
+      ``loc.__getitem__``.  So this test belongs in ``tests.indexing.test_loc``.
 
 6. Is your test for a DataFrame or Series method?
 
diff --git a/doc/source/development/contributing_gitpod.rst b/doc/source/development/contributing_gitpod.rst
@@ -158,8 +158,8 @@ Option 1: using Liveserve
    file and click on **Open with Live Serve**. Alternatively, you can open the
    file in the editor and click on the **Go live** button on the status bar.
 
-    .. image:: ./gitpod-imgs/vscode-statusbar.png
-        :alt: Gitpod workspace VSCode start live serve screenshot
+   .. image:: ./gitpod-imgs/vscode-statusbar.png
+      :alt: Gitpod workspace VSCode start live serve screenshot
 
 #. A simple browser will open to the right-hand side of the editor. We recommend
    closing it and click on the **Open in browser** button in the pop-up.
@@ -182,13 +182,13 @@ uses the rst extension with docutils.
    :kbd:`Ctrl-Shift-P` in Linux and Windows. Start typing "restructured"
    and choose either "Open preview" or "Open preview to the Side".
 
-    .. image:: ./gitpod-imgs/vscode-rst.png
-        :alt: Gitpod workspace VSCode open rst screenshot
+   .. image:: ./gitpod-imgs/vscode-rst.png
+      :alt: Gitpod workspace VSCode open rst screenshot
 
 #. As you work on the document, you will see a live rendering of it on the editor.
 
-    .. image:: ./gitpod-imgs/rst-rendering.png
-        :alt: Gitpod workspace VSCode rst rendering screenshot
+   .. image:: ./gitpod-imgs/rst-rendering.png
+      :alt: Gitpod workspace VSCode rst rendering screenshot
 
 If you want to see the final output with the ``html`` theme you will need to
 rebuild the docs with ``make html`` and use Live Serve as described in option 1.
diff --git a/doc/source/development/debugging_extensions.rst b/doc/source/development/debugging_extensions.rst
@@ -10,9 +10,9 @@ pandas uses Cython and C/C++ `extension modules <https://docs.python.org/3/exten
 
 For Python developers with limited or no C/C++ experience this can seem a daunting task. Core developer Will Ayd has written a 3 part blog series to help guide you from the standard Python debugger into these other tools:
 
-  1. `Fundamental Python Debugging Part 1 - Python <https://willayd.com/fundamental-python-debugging-part-1-python.html>`_
-  2. `Fundamental Python Debugging Part 2 - Python Extensions <https://willayd.com/fundamental-python-debugging-part-2-python-extensions.html>`_
-  3. `Fundamental Python Debugging Part 3 - Cython Extensions <https://willayd.com/fundamental-python-debugging-part-3-cython-extensions.html>`_
+1. `Fundamental Python Debugging Part 1 - Python <https://willayd.com/fundamental-python-debugging-part-1-python.html>`_
+2. `Fundamental Python Debugging Part 2 - Python Extensions <https://willayd.com/fundamental-python-debugging-part-2-python-extensions.html>`_
+3. `Fundamental Python Debugging Part 3 - Cython Extensions <https://willayd.com/fundamental-python-debugging-part-3-cython-extensions.html>`_
 
 Debugging locally
 -----------------
diff --git a/doc/source/development/developer.rst b/doc/source/development/developer.rst
@@ -116,19 +116,19 @@ The ``metadata`` field is ``None`` except for:
   omitted it is assumed to be nanoseconds.
 * ``categorical``: ``{'num_categories': K, 'ordered': is_ordered, 'type': $TYPE}``
 
-    * Here ``'type'`` is optional, and can be a nested pandas type specification
-      here (but not categorical)
+  * Here ``'type'`` is optional, and can be a nested pandas type specification
+    here (but not categorical)
 
 * ``unicode``: ``{'encoding': encoding}``
 
-    * The encoding is optional, and if not present is UTF-8
+  * The encoding is optional, and if not present is UTF-8
 
 * ``object``: ``{'encoding': encoding}``. Objects can be serialized and stored
   in ``BYTE_ARRAY`` Parquet columns. The encoding can be one of:
 
-    * ``'pickle'``
-    * ``'bson'``
-    * ``'json'``
+  * ``'pickle'``
+  * ``'bson'``
+  * ``'json'``
 
 * ``timedelta``: ``{'unit': 'ns'}``. The ``'unit'`` is optional, and if omitted
   it is assumed to be nanoseconds. This metadata is optional altogether
diff --git a/doc/source/development/maintaining.rst b/doc/source/development/maintaining.rst
@@ -218,11 +218,11 @@ pandas supports point releases (e.g. ``1.4.3``) that aim to:
 
 1. Fix bugs in new features introduced in the first minor version release.
 
-  * e.g. If a new feature was added in ``1.4`` and contains a bug, a fix can be applied in ``1.4.3``
+   * e.g. If a new feature was added in ``1.4`` and contains a bug, a fix can be applied in ``1.4.3``
 
 2. Fix bugs that used to work in a few minor releases prior. There should be agreement between core team members that a backport is appropriate.
 
-  * e.g. If a feature worked in ``1.2`` and stopped working since ``1.3``, a fix can be applied in ``1.4.3``.
+   * e.g. If a feature worked in ``1.2`` and stopped working since ``1.3``, a fix can be applied in ``1.4.3``.
 
 Since pandas minor releases are based on GitHub branches (e.g. point release of ``1.4`` are based off the ``1.4.x`` branch),
 "backporting" means merging a pull request fix to the ``main`` branch and correct minor branch associated with the next point release.
@@ -289,8 +289,8 @@ The required steps for adding a maintainer are:
 1. Contact the contributor and ask their interest to join.
 2. Add the contributor to the appropriate `GitHub Team <https://github.com/orgs/pandas-dev/teams>`_ if accepted the invitation.
 
-  * ``pandas-core`` is for core team members
-  * ``pandas-triage`` is for pandas triage members
+   * ``pandas-core`` is for core team members
+   * ``pandas-triage`` is for pandas triage members
 
 If adding to ``pandas-core``, there are two additional steps:
 
@@ -467,10 +467,10 @@ Post-Release
    patch releases. The exact instructions are (replace the example version numbers by
    the appropriate ones for the version you are releasing):
 
-    - Log in to the server and use the correct user.
-    - ``cd /var/www/html/pandas-docs/``
-    - ``ln -sfn version/2.1 stable`` (for a major or minor release)
-    - ``ln -sfn version/2.0.3 version/2.0`` (for a patch release)
+   - Log in to the server and use the correct user.
+   - ``cd /var/www/html/pandas-docs/``
+   - ``ln -sfn version/2.1 stable`` (for a major or minor release)
+   - ``ln -sfn version/2.0.3 version/2.0`` (for a patch release)
 
 2. If releasing a major or minor release, open a PR in our source code to update
    ``web/pandas/versions.json``, to have the desired versions in the documentation
@@ -487,8 +487,8 @@ Post-Release
 6. Announce the new release in the official channels (use previous announcements
    for reference):
 
-    - The pandas-dev and pydata mailing lists
-    - X, Mastodon, Telegram and LinkedIn
+   - The pandas-dev and pydata mailing lists
+   - X, Mastodon, Telegram and LinkedIn
 
 7. Update this release instructions to fix anything incorrect and to update about any
    change since the last release.
diff --git a/doc/source/user_guide/enhancingperf.rst b/doc/source/user_guide/enhancingperf.rst
@@ -50,7 +50,7 @@ We have a :class:`DataFrame` to which we want to apply a function row-wise.
        {
            "a": np.random.randn(1000),
            "b": np.random.randn(1000),
-           "N": np.random.randint(100, 1000, (1000)),
+           "N": np.random.randint(100, 1000, (1000), dtype="int64"),
            "x": "x",
        }
    )
@@ -83,7 +83,7 @@ using the `prun ipython magic function <https://ipython.readthedocs.io/en/stable
 .. ipython:: python
 
    # most time consuming 4 calls
-   %prun -l 4 df.apply(lambda x: integrate_f(x["a"], x["b"], x["N"]), axis=1)  # noqa E999
+   %prun -l 4 df.apply(lambda x: integrate_f(x['a'], x['b'], x['N']), axis=1)
 
 By far the majority of time is spend inside either ``integrate_f`` or ``f``,
 hence we'll concentrate our efforts cythonizing these two functions.
@@ -164,7 +164,7 @@ can be improved by passing an ``np.ndarray``.
 
 .. ipython:: python
 
-   %prun -l 4 df.apply(lambda x: integrate_f_typed(x["a"], x["b"], x["N"]), axis=1)
+   %prun -l 4 df.apply(lambda x: integrate_f_typed(x['a'], x['b'], x['N']), axis=1)
 
 .. ipython::
 
@@ -204,7 +204,7 @@ calls are needed to utilize this function.
 
 .. ipython:: python
 
-   %timeit apply_integrate_f(df["a"].to_numpy(), df["b"].to_numpy(), df["N"].to_numpy())
+   %timeit apply_integrate_f(df['a'].to_numpy(), df['b'].to_numpy(), df['N'].to_numpy())
 
 Performance has improved from the prior implementation by almost ten times.
 
@@ -218,7 +218,7 @@ and ``wraparound`` checks can yield more performance.
 
 .. ipython:: python
 
-   %prun -l 4 apply_integrate_f(df["a"].to_numpy(), df["b"].to_numpy(), df["N"].to_numpy())
+   %prun -l 4 apply_integrate_f(df['a'].to_numpy(), df['b'].to_numpy(), df['N'].to_numpy())
 
 .. ipython::
 
@@ -253,7 +253,7 @@ and ``wraparound`` checks can yield more performance.
 
 .. ipython:: python
 
-   %timeit apply_integrate_f_wrap(df["a"].to_numpy(), df["b"].to_numpy(), df["N"].to_numpy())
+   %timeit apply_integrate_f_wrap(df['a'].to_numpy(), df['b'].to_numpy(), df['N'].to_numpy())
 
 However, a loop indexer ``i`` accessing an invalid location in an array would cause a segfault because memory access isn't checked.
 For more about ``boundscheck`` and ``wraparound``, see the Cython docs on
diff --git a/doc/source/whatsnew/index.rst b/doc/source/whatsnew/index.rst
@@ -24,6 +24,7 @@ Version 2.3
 .. toctree::
    :maxdepth: 2
 
+   v2.3.1
    v2.3.0
 
 Version 2.2
diff --git a/doc/source/whatsnew/v2.3.1.rst b/doc/source/whatsnew/v2.3.1.rst
@@ -0,0 +1,42 @@
+.. _whatsnew_231:
+
+What's new in 2.3.1 (Month XX, 2025)
+------------------------------------
+
+These are the changes in pandas 2.3.1. See :ref:`release` for a full changelog
+including other versions of pandas.
+
+{{ header }}
+
+.. ---------------------------------------------------------------------------
+.. _whatsnew_231.enhancements:
+
+Enhancements
+~~~~~~~~~~~~
+-
+
+.. _whatsnew_231.regressions:
+
+Fixed regressions
+~~~~~~~~~~~~~~~~~
+-
+
+.. ---------------------------------------------------------------------------
+.. _whatsnew_231.bug_fixes:
+
+Bug fixes
+~~~~~~~~~
+-
+
+.. ---------------------------------------------------------------------------
+.. _whatsnew_231.other:
+
+Other
+~~~~~
+-
+
+.. ---------------------------------------------------------------------------
+.. _whatsnew_231.contributors:
+
+Contributors
+~~~~~~~~~~~~
diff --git a/doc/source/whatsnew/v3.0.0.rst b/doc/source/whatsnew/v3.0.0.rst
@@ -65,6 +65,7 @@ Other enhancements
 - :class:`ArrowDtype` now supports ``pyarrow.JsonType`` (:issue:`60958`)
 - :class:`DataFrameGroupBy` and :class:`SeriesGroupBy` methods ``sum``, ``mean``, ``median``, ``prod``, ``min``, ``max``, ``std``, ``var`` and ``sem`` now accept ``skipna`` parameter (:issue:`15675`)
 - :class:`Easter` has gained a new constructor argument ``method`` which specifies the method used to calculate Easter — for example, Orthodox Easter (:issue:`61665`)
+- :class:`Holiday` constructor argument ``days_of_week`` will raise a ``ValueError`` when type is something other than ``None`` or ``tuple`` (:issue:`61658`)
 - :class:`Holiday` has gained the constructor argument and field ``exclude_dates`` to exclude specific datetimes from a custom holiday calendar (:issue:`54382`)
 - :class:`Rolling` and :class:`Expanding` now support ``nunique`` (:issue:`26958`)
 - :class:`Rolling` and :class:`Expanding` now support aggregations ``first`` and ``last`` (:issue:`33155`)
diff --git a/pandas/tests/tseries/holiday/test_holiday.py b/pandas/tests/tseries/holiday/test_holiday.py
@@ -454,3 +454,10 @@ def test_exclude_date_value_error():
             Timestamp("2026-06-10"),
         ]
         Holiday("National Ice Tea Day", month=6, day=10, exclude_dates=exclude)
+
+
+def test_days_of_week_value_error():
+    msg = "days_of_week must be None or tuple."
+
+    with pytest.raises(ValueError, match=msg):
+        Holiday("World Blood Donor Day", month=6, day=14, days_of_week=[0, 1])
diff --git a/pandas/tseries/holiday.py b/pandas/tseries/holiday.py
@@ -192,8 +192,9 @@ class from pandas.tseries.offsets, default None
         end_date : datetime-like, default None
             Last date the holiday is observed
         days_of_week : tuple of int or dateutil.relativedelta weekday strs, default None
-            Provide a tuple of days e.g  (0,1,2,3,) for Monday Through Thursday
+            Provide a tuple of days e.g  (0,1,2,3,) for Monday through Thursday
             Monday=0,..,Sunday=6
+            Only instances of the holiday included in days_of_week will be computed
         exclude_dates : DatetimeIndex or default None
             Specific dates to exclude e.g. skipping a specific year's holiday
 
@@ -258,7 +259,8 @@ class from pandas.tseries.offsets, default None
         )
         self.end_date = Timestamp(end_date) if end_date is not None else end_date
         self.observance = observance
-        assert days_of_week is None or type(days_of_week) == tuple
+        if not (days_of_week is None or isinstance(days_of_week, tuple)):
+            raise ValueError("days_of_week must be None or tuple.")
         self.days_of_week = days_of_week
         if not (exclude_dates is None or isinstance(exclude_dates, DatetimeIndex)):
             raise ValueError("exclude_dates must be None or of type DatetimeIndex.")
