Skip to content

Commit 9da0d4b

Browse files
authored
Merge branch 'main' into mutation
2 parents 34cb1d3 + 94a7c14 commit 9da0d4b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+237
-225
lines changed

asv_bench/benchmarks/indexing_engines.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def setup(self, engine_and_dtype, index_type, unique, N):
8787
arr = np.array([1, 2, 3], dtype=dtype).repeat(N)
8888

8989
self.data = engine(arr)
90-
# code belows avoids populating the mapping etc. while timing.
90+
# code below avoids populating the mapping etc. while timing.
9191
self.data.get_loc(2)
9292

9393
self.key_middle = arr[len(arr) // 2]
@@ -140,7 +140,7 @@ def setup(self, engine_and_dtype, index_type, unique, N):
140140
mask[-1] = True
141141

142142
self.data = engine(BaseMaskedArray(arr, mask))
143-
# code belows avoids populating the mapping etc. while timing.
143+
# code below avoids populating the mapping etc. while timing.
144144
self.data.get_loc(2)
145145

146146
self.key_middle = arr[len(arr) // 2]
@@ -169,7 +169,7 @@ def setup(self, index_type):
169169
}[index_type]
170170

171171
self.data = libindex.ObjectEngine(arr)
172-
# code belows avoids populating the mapping etc. while timing.
172+
# code below avoids populating the mapping etc. while timing.
173173
self.data.get_loc("b")
174174

175175
def time_get_loc(self, index_type):

ci/code_checks.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,8 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
7070
--format=actions \
7171
-i ES01 `# For now it is ok if docstrings are missing the extended summary` \
7272
-i "pandas.Series.dt PR01" `# Accessors are implemented as classes, but we do not document the Parameters section` \
73-
-i "pandas.MultiIndex.reorder_levels RT03,SA01" \
7473
-i "pandas.NA SA01" \
75-
-i "pandas.NaT SA01" \
7674
-i "pandas.Period.freq GL08" \
77-
-i "pandas.Period.freqstr SA01" \
7875
-i "pandas.Period.ordinal GL08" \
7976
-i "pandas.Period.strftime PR01,SA01" \
8077
-i "pandas.Period.to_timestamp SA01" \

doc/source/development/contributing_codebase.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ The ``temp_file`` pytest fixture creates a temporary file :py:class:`Pathlib` ob
605605
pd.DataFrame([1]).to_csv(str(temp_file))
606606
607607
Please reference `pytest's documentation <https://docs.pytest.org/en/latest/how-to/tmp_path.html#the-default-base-temporary-directory>`_
608-
for the file retension policy.
608+
for the file retention policy.
609609

610610
Testing involving network connectivity
611611
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

doc/source/development/debugging_extensions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ By specifying ``builddir="debug"`` all of the targets will be built and placed i
3030
Using Docker
3131
------------
3232

33-
To simplify the debugging process, pandas has created a Docker image with a debug build of Python and the gdb/Cython debuggers pre-installed. You may either ``docker pull pandas/pandas-debug`` to get access to this image or build it from the ``tooling/debug`` folder locallly.
33+
To simplify the debugging process, pandas has created a Docker image with a debug build of Python and the gdb/Cython debuggers pre-installed. You may either ``docker pull pandas/pandas-debug`` to get access to this image or build it from the ``tooling/debug`` folder locally.
3434

3535
You can then mount your pandas repository into this image via:
3636

doc/source/getting_started/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ the pandas-equivalent operations compared to software you already know:
613613

614614
Users of `Excel <https://en.wikipedia.org/wiki/Microsoft_Excel>`__
615615
or other spreadsheet programs will find that many of the concepts are
616-
transferrable to pandas.
616+
transferable to pandas.
617617

618618
+++
619619

doc/source/user_guide/cookbook.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ Using TimeGrouper and another grouping to create subgroups, then apply a custom
914914
<https://stackoverflow.com/questions/15408156/resampling-with-custom-periods>`__
915915

916916
`Resample intraday frame without adding new days
917-
<https://stackoverflow.com/questions/14898574/resample-intrday-pandas-dataframe-without-add-new-days>`__
917+
<https://stackoverflow.com/questions/14898574/resample-intraday-pandas-dataframe-without-add-new-days>`__
918918

919919
`Resample minute data
920920
<https://stackoverflow.com/questions/14861023/resampling-minute-data>`__

doc/source/user_guide/io.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ dtype_backend : {"numpy_nullable", "pyarrow"}, defaults to NumPy backed DataFram
169169
implementation when "numpy_nullable" is set, pyarrow is used for all
170170
dtypes if "pyarrow" is set.
171171

172-
The dtype_backends are still experimential.
172+
The dtype_backends are still experimental.
173173

174174
.. versionadded:: 2.0
175175

@@ -2893,7 +2893,7 @@ Read in the content of the "books.xml" as instance of ``StringIO`` or
28932893
df
28942894
28952895
Even read XML from AWS S3 buckets such as NIH NCBI PMC Article Datasets providing
2896-
Biomedical and Life Science Jorurnals:
2896+
Biomedical and Life Science Journals:
28972897

28982898
.. code-block:: python
28992899

doc/source/user_guide/style.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1182,7 +1182,7 @@
11821182
"Some styling functions are common enough that we've \"built them in\" to the `Styler`, so you don't have to write them and apply them yourself. The current list of such functions is:\n",
11831183
"\n",
11841184
" - [.highlight_null][nullfunc]: for use with identifying missing data. \n",
1185-
" - [.highlight_min][minfunc] and [.highlight_max][maxfunc]: for use with identifying extremeties in data.\n",
1185+
" - [.highlight_min][minfunc] and [.highlight_max][maxfunc]: for use with identifying extremities in data.\n",
11861186
" - [.highlight_between][betweenfunc] and [.highlight_quantile][quantilefunc]: for use with identifying classes within data.\n",
11871187
" - [.background_gradient][bgfunc]: a flexible method for highlighting cells based on their, or other, values on a numeric scale.\n",
11881188
" - [.text_gradient][textfunc]: similar method for highlighting text based on their, or other, values on a numeric scale.\n",

doc/source/user_guide/visualization.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ Plotting with error bars
15041504

15051505
Plotting with error bars is supported in :meth:`DataFrame.plot` and :meth:`Series.plot`.
15061506

1507-
Horizontal and vertical error bars can be supplied to the ``xerr`` and ``yerr`` keyword arguments to :meth:`~DataFrame.plot()`. The error values can be specified using a variety of formats:
1507+
Horizontal and vertical error bars can be supplied to the ``xerr`` and ``yerr`` keyword arguments to :meth:`~DataFrame.plot`. The error values can be specified using a variety of formats:
15081508

15091509
* As a :class:`DataFrame` or ``dict`` of errors with column names matching the ``columns`` attribute of the plotting :class:`DataFrame` or matching the ``name`` attribute of the :class:`Series`.
15101510
* As a ``str`` indicating which of the columns of plotting :class:`DataFrame` contain the error values.

doc/source/whatsnew/v0.15.0.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ Rolling/expanding moments improvements
490490
``ddof`` argument (with a default value of ``1``) was previously undocumented. (:issue:`8064`)
491491

492492
- :func:`ewma`, :func:`ewmstd`, :func:`ewmvol`, :func:`ewmvar`, :func:`ewmcov`, and :func:`ewmcorr`
493-
now interpret ``min_periods`` in the same manner that the :func:`rolling_*()` and :func:`expanding_*()` functions do:
493+
now interpret ``min_periods`` in the same manner that the :func:`rolling_*` and :func:`expanding_*` functions do:
494494
a given result entry will be ``NaN`` if the (expanding, in this case) window does not contain
495495
at least ``min_periods`` values. The previous behavior was to set to ``NaN`` the ``min_periods`` entries
496496
starting with the first non- ``NaN`` value. (:issue:`7977`)
@@ -567,7 +567,7 @@ Rolling/expanding moments improvements
567567
568568
.. warning::
569569

570-
By default (``ignore_na=False``) the :func:`ewm*()` functions' weights calculation
570+
By default (``ignore_na=False``) the :func:`ewm*` functions' weights calculation
571571
in the presence of missing values is different than in pre-0.15.0 versions.
572572
To reproduce the pre-0.15.0 calculation of weights in the presence of missing values
573573
one must specify explicitly ``ignore_na=True``.
@@ -576,7 +576,7 @@ Rolling/expanding moments improvements
576576
returning results with columns sorted by name and producing an error for non-unique columns;
577577
now handles non-unique columns and returns columns in original order
578578
(except for the case of two DataFrames with ``pairwise=False``, where behavior is unchanged) (:issue:`7542`)
579-
- Bug in :func:`rolling_count` and :func:`expanding_*()` functions unnecessarily producing error message for zero-length data (:issue:`8056`)
579+
- Bug in :func:`rolling_count` and :func:`expanding_*` functions unnecessarily producing error message for zero-length data (:issue:`8056`)
580580
- Bug in :func:`rolling_apply` and :func:`expanding_apply` interpreting ``min_periods=0`` as ``min_periods=1`` (:issue:`8080`)
581581
- Bug in :func:`expanding_std` and :func:`expanding_var` for a single value producing a confusing error message (:issue:`7900`)
582582
- Bug in :func:`rolling_std` and :func:`rolling_var` for a single value producing ``0`` rather than ``NaN`` (:issue:`7900`)
@@ -875,7 +875,7 @@ Other notable API changes:
875875
The behaviour of assigning a column to an existing dataframe as ``df['a'] = i``
876876
remains unchanged (this already returned an ``object`` column with a timezone).
877877

878-
- When passing multiple levels to :meth:`~pandas.DataFrame.stack()`, it will now raise a ``ValueError`` when the
878+
- When passing multiple levels to :meth:`~pandas.DataFrame.stack`, it will now raise a ``ValueError`` when the
879879
levels aren't all level names or all level numbers (:issue:`7660`). See
880880
:ref:`Reshaping by stacking and unstacking <reshaping.stack_multiple>`.
881881

@@ -1110,7 +1110,7 @@ Other:
11101110

11111111
- ``DataFrame.fillna`` can now accept a ``DataFrame`` as a fill value (:issue:`8377`)
11121112

1113-
- Passing multiple levels to :meth:`~pandas.DataFrame.stack()` will now work when multiple level
1113+
- Passing multiple levels to :meth:`~pandas.DataFrame.stack` will now work when multiple level
11141114
numbers are passed (:issue:`7660`). See
11151115
:ref:`Reshaping by stacking and unstacking <reshaping.stack_multiple>`.
11161116

0 commit comments

Comments
 (0)