Skip to content

Commit 5b02464

Browse files
committed
Merge upstream/main
2 parents 4a3446e + 844b319 commit 5b02464

File tree

505 files changed

+187385
-30
lines changed

Some content is hidden

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

505 files changed

+187385
-30
lines changed

ci/code_checks.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,28 +73,33 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
7373
-i "pandas.Period.freq GL08" \
7474
-i "pandas.Period.ordinal GL08" \
7575
-i "pandas.RangeIndex.from_range PR01,SA01" \
76+
<<<<<<< HEAD
7677
-i "pandas.Series.dt.unit GL08" \
7778
-i "pandas.Series.pad PR01,SA01" \
79+
=======
80+
-i "pandas.Timedelta.max PR02" \
81+
-i "pandas.Timedelta.min PR02" \
82+
-i "pandas.Timedelta.resolution PR02" \
83+
-i "pandas.Timestamp.max PR02" \
84+
-i "pandas.Timestamp.min PR02" \
85+
-i "pandas.Timestamp.resolution PR02" \
86+
>>>>>>> upstream/main
7887
-i "pandas.Timestamp.tzinfo GL08" \
7988
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
8089
-i "pandas.arrays.IntervalArray.length SA01" \
8190
-i "pandas.arrays.NumpyExtensionArray SA01" \
8291
-i "pandas.arrays.TimedeltaArray PR07,SA01" \
8392
-i "pandas.core.groupby.DataFrameGroupBy.boxplot PR07,RT03,SA01" \
8493
-i "pandas.core.groupby.DataFrameGroupBy.get_group RT03,SA01" \
85-
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
8694
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
87-
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
8895
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
8996
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
90-
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
9197
-i "pandas.core.resample.Resampler.get_group RT03,SA01" \
9298
-i "pandas.core.resample.Resampler.max PR01,RT03,SA01" \
9399
-i "pandas.core.resample.Resampler.mean SA01" \
94100
-i "pandas.core.resample.Resampler.min PR01,RT03,SA01" \
95101
-i "pandas.core.resample.Resampler.prod SA01" \
96102
-i "pandas.core.resample.Resampler.quantile PR01,PR07" \
97-
-i "pandas.core.resample.Resampler.sem SA01" \
98103
-i "pandas.core.resample.Resampler.std SA01" \
99104
-i "pandas.core.resample.Resampler.transform PR01,RT03,SA01" \
100105
-i "pandas.core.resample.Resampler.var SA01" \

0 commit comments

Comments
 (0)