Skip to content

Commit 759766e

Browse files
committed
Merge remote-tracking branch 'upstream/master' into SS05
* upstream/master: TST/REF: collect DataFrame reduction tests (pandas-dev#24914) DOC: Improve docstring of Series.mul (pandas-dev#25136) Removal of return variable names (pandas-dev#25123) BUG: Fixing regression in DataFrame.all and DataFrame.any with bool_only=True (pandas-dev#25102) Reading a HDF5 created in py2 (pandas-dev#25058) DOC: Fix validation type error RT04 (pandas-dev#25107) (pandas-dev#25129)
2 parents fa7e465 + 2e38d55 commit 759766e

File tree

17 files changed

+472
-391
lines changed

17 files changed

+472
-391
lines changed

ci/code_checks.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ fi
240240
### DOCSTRINGS ###
241241
if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
242242

243-
MSG='Validate docstrings (GL06, GL07, GL09, SS04, PR03, PR05, EX04, SS05)' ; echo $MSG
244-
$BASE_DIR/scripts/validate_docstrings.py --format=azure --errors=GL06,GL07,GL09,SS04,PR03,PR05,EX04, SS05
243+
MSG='Validate docstrings (GL06, GL07, GL09, SS04, PR03, PR05, EX04, RT04, SS05)' ; echo $MSG
244+
$BASE_DIR/scripts/validate_docstrings.py --format=azure --errors=GL06,GL07,GL09,SS04,PR03,PR05,EX04,RT04,SS05
245245
RET=$(($RET + $?)) ; echo $MSG "DONE"
246246

247247
fi

doc/source/whatsnew/v0.24.2.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ including other versions of pandas.
2020
Fixed Regressions
2121
^^^^^^^^^^^^^^^^^
2222

23-
-
24-
-
25-
-
23+
- Fixed regression in :meth:`DataFrame.all` and :meth:`DataFrame.any` where ``bool_only=True`` was ignored (:issue:`25101`)
2624

2725
.. _whatsnew_0242.enhancements:
2826

@@ -51,7 +49,7 @@ Bug Fixes
5149

5250
**I/O**
5351

54-
-
52+
- Bug in reading a HDF5 table-format ``DataFrame`` created in Python 2, in Python 3 (:issue:`24925`)
5553
-
5654
-
5755

pandas/core/algorithms.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,9 @@ def unique(values):
289289
Returns
290290
-------
291291
unique values.
292-
- If the input is an Index, the return is an Index
293-
- If the input is a Categorical dtype, the return is a Categorical
294-
- If the input is a Series/ndarray, the return will be an ndarray
292+
If the input is an Index, the return is an Index
293+
If the input is a Categorical dtype, the return is a Categorical
294+
If the input is a Series/ndarray, the return will be an ndarray
295295
296296
See Also
297297
--------

0 commit comments

Comments
 (0)