Skip to content

Commit 6336d8b

Browse files
author
auderson
committed
Merge remote-tracking branch 'upstream/main' into same_val_counts_for_roll_skew_kurt
# Conflicts: # doc/source/whatsnew/v1.5.0.rst
2 parents 87daea6 + b6f21f3 commit 6336d8b

Some content is hidden

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

50 files changed

+858
-631
lines changed

.github/workflows/posix.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
env_file: actions-310-numpydev.yaml
6262
pattern: "not slow and not network and not single_cpu"
6363
pandas_testing_mode: "deprecate"
64-
test_args: "-W error"
64+
test_args: "-W error::DeprecationWarning:numpy"
6565
fail-fast: false
6666
name: ${{ matrix.name || format('{0} pyarrow={1} {2}', matrix.env_file, matrix.pyarrow_version, matrix.pattern) }}
6767
env:
@@ -174,7 +174,7 @@ jobs:
174174
if: always()
175175

176176
- name: Build Version
177-
run: pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
177+
run: conda list
178178

179179
- name: Publish test results
180180
uses: actions/upload-artifact@v3

ci/code_checks.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ fi
7878
### DOCSTRINGS ###
7979
if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
8080

81-
MSG='Validate docstrings (EX04, GL01, GL02, GL03, GL04, GL05, GL06, GL07, GL09, GL10, PR03, PR04, PR05, PR06, PR08, PR09, PR10, RT01, RT04, RT05, SA02, SA03, SS01, SS02, SS03, SS04, SS05)' ; echo $MSG
82-
$BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=EX04,GL01,GL02,GL03,GL04,GL05,GL06,GL07,GL09,GL10,PR03,PR04,PR05,PR06,PR08,PR09,PR10,RT01,RT04,RT05,SA02,SA03,SS01,SS02,SS03,SS04,SS05
81+
MSG='Validate docstrings (EX04, GL01, GL02, GL03, GL04, GL05, GL06, GL07, GL09, GL10, PR03, PR04, PR05, PR06, PR08, PR09, PR10, RT01, RT04, RT05, SA02, SA03, SA04, SS01, SS02, SS03, SS04, SS05)' ; echo $MSG
82+
$BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=EX04,GL01,GL02,GL03,GL04,GL05,GL06,GL07,GL09,GL10,PR03,PR04,PR05,PR06,PR08,PR09,PR10,RT01,RT04,RT05,SA02,SA03,SA04,SS01,SS02,SS03,SS04,SS05
8383
RET=$(($RET + $?)) ; echo $MSG "DONE"
8484

8585
fi

doc/source/whatsnew/v1.5.0.rst

+3
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,9 @@ Groupby/resample/rolling
600600
- Bug in :meth:`GroupBy.max` with empty groups and ``uint64`` dtype incorrectly raising ``RuntimeError`` (:issue:`46408`)
601601
- Bug in :meth:`.GroupBy.apply` would fail when ``func`` was a string and args or kwargs were supplied (:issue:`46479`)
602602
- Bug in :meth:`Rolling.skew` and :meth:`Rolling.kurt` would give NaN with window of same values (:issue:`30993`)
603+
- Bug in :meth:`SeriesGroupBy.apply` would incorrectly name its result when there was a unique group (:issue:`46369`)
604+
- Bug in :meth:`.Rolling.var` would segfault calculating weighted variance when window size was larger than data size (:issue:`46760`)
605+
- Bug in :meth:`Grouper.__repr__` where ``dropna`` was not included. Now it is (:issue:`46754`)
603606

604607
Reshaping
605608
^^^^^^^^^

pandas/_libs/algos_common_helper.pxi.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ def ensure_{{name}}(object arr, copy=True):
6565
if (<ndarray>arr).descr.type_num == NPY_{{c_type}}:
6666
return arr
6767
else:
68-
return arr.astype(np.{{dtype}}, copy=copy)
68+
# equiv: arr.astype(np.{{dtype}}, copy=copy)
69+
return cnp.PyArray_Cast(<ndarray>arr, cnp.NPY_{{c_type}})
6970
else:
7071
return np.array(arr, dtype=np.{{dtype}})
7172

pandas/_libs/dtypes.pxd

-12
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,3 @@ ctypedef fused numeric_t:
3434
ctypedef fused numeric_object_t:
3535
numeric_t
3636
object
37-
38-
# i64 + u64 + all float types
39-
ctypedef fused iu_64_floating_t:
40-
float64_t
41-
float32_t
42-
int64_t
43-
uint64_t
44-
45-
# i64 + u64 + all float types + object
46-
ctypedef fused iu_64_floating_obj_t:
47-
iu_64_floating_t
48-
object

0 commit comments

Comments
 (0)