Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into SS05
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
thoo committed Feb 4, 2019
2 parents fa7e465 + 2e38d55 commit 759766e
Show file tree
Hide file tree
Showing 17 changed files with 472 additions and 391 deletions.
4 changes: 2 additions & 2 deletions ci/code_checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,8 @@ fi
### DOCSTRINGS ###
if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then

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

fi
Expand Down
6 changes: 2 additions & 4 deletions doc/source/whatsnew/v0.24.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ including other versions of pandas.
Fixed Regressions
^^^^^^^^^^^^^^^^^

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

.. _whatsnew_0242.enhancements:

Expand Down Expand Up @@ -51,7 +49,7 @@ Bug Fixes

**I/O**

-
- Bug in reading a HDF5 table-format ``DataFrame`` created in Python 2, in Python 3 (:issue:`24925`)
-
-

Expand Down
6 changes: 3 additions & 3 deletions pandas/core/algorithms.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,9 @@ def unique(values):
Returns
-------
unique values.
- If the input is an Index, the return is an Index
- If the input is a Categorical dtype, the return is a Categorical
- If the input is a Series/ndarray, the return will be an ndarray
If the input is an Index, the return is an Index
If the input is a Categorical dtype, the return is a Categorical
If the input is a Series/ndarray, the return will be an ndarray
See Also
--------
Expand Down
Loading

0 comments on commit 759766e

Please sign in to comment.