Skip to content

Commit 4ce5587

Browse files
authored
Merge branch 'main' into dependabot/github_actions/pypa/cibuildwheel-2.21.3
2 parents 10e4093 + f770bee commit 4ce5587

20 files changed

+116
-31
lines changed

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ minimum_pre_commit_version: 2.15.0
22
exclude: ^LICENSES/|\.(html|csv|svg)$
33
# reserve "manual" for relatively slow hooks which we still want to run in CI
44
default_stages: [
5-
commit,
6-
merge-commit,
7-
push,
5+
pre-commit,
6+
pre-merge-commit,
7+
pre-push,
88
prepare-commit-msg,
99
commit-msg,
1010
post-checkout,

ci/code_checks.sh

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
8585
-i "pandas.Timestamp.resolution PR02" \
8686
-i "pandas.Timestamp.tzinfo GL08" \
8787
-i "pandas.Timestamp.year GL08" \
88-
-i "pandas.api.types.is_integer PR01,SA01" \
8988
-i "pandas.api.types.is_iterator PR07,SA01" \
9089
-i "pandas.api.types.is_re_compilable PR07,SA01" \
9190
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
@@ -97,43 +96,35 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
9796
-i "pandas.arrays.NumpyExtensionArray SA01" \
9897
-i "pandas.arrays.SparseArray PR07,SA01" \
9998
-i "pandas.arrays.TimedeltaArray PR07,SA01" \
100-
-i "pandas.core.groupby.DataFrameGroupBy.__iter__ RT03,SA01" \
10199
-i "pandas.core.groupby.DataFrameGroupBy.boxplot PR07,RT03,SA01" \
102100
-i "pandas.core.groupby.DataFrameGroupBy.get_group RT03,SA01" \
103101
-i "pandas.core.groupby.DataFrameGroupBy.groups SA01" \
104102
-i "pandas.core.groupby.DataFrameGroupBy.indices SA01" \
105103
-i "pandas.core.groupby.DataFrameGroupBy.nth PR02" \
106104
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
107-
-i "pandas.core.groupby.DataFrameGroupBy.ohlc SA01" \
108105
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
109106
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
110-
-i "pandas.core.groupby.SeriesGroupBy.__iter__ RT03,SA01" \
111107
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
112108
-i "pandas.core.groupby.SeriesGroupBy.groups SA01" \
113109
-i "pandas.core.groupby.SeriesGroupBy.indices SA01" \
114110
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_decreasing SA01" \
115111
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_increasing SA01" \
116112
-i "pandas.core.groupby.SeriesGroupBy.nth PR02" \
117-
-i "pandas.core.groupby.SeriesGroupBy.ohlc SA01" \
118113
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
119114
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
120-
-i "pandas.core.resample.Resampler.__iter__ RT03,SA01" \
121115
-i "pandas.core.resample.Resampler.get_group RT03,SA01" \
122116
-i "pandas.core.resample.Resampler.groups SA01" \
123117
-i "pandas.core.resample.Resampler.indices SA01" \
124118
-i "pandas.core.resample.Resampler.max PR01,RT03,SA01" \
125119
-i "pandas.core.resample.Resampler.mean SA01" \
126120
-i "pandas.core.resample.Resampler.min PR01,RT03,SA01" \
127-
-i "pandas.core.resample.Resampler.ohlc SA01" \
128121
-i "pandas.core.resample.Resampler.prod SA01" \
129122
-i "pandas.core.resample.Resampler.quantile PR01,PR07" \
130123
-i "pandas.core.resample.Resampler.sem SA01" \
131124
-i "pandas.core.resample.Resampler.std SA01" \
132-
-i "pandas.core.resample.Resampler.sum SA01" \
133125
-i "pandas.core.resample.Resampler.transform PR01,RT03,SA01" \
134126
-i "pandas.core.resample.Resampler.var SA01" \
135127
-i "pandas.errors.AttributeConflictWarning SA01" \
136-
-i "pandas.errors.CSSWarning SA01" \
137128
-i "pandas.errors.ChainedAssignmentError SA01" \
138129
-i "pandas.errors.DataError SA01" \
139130
-i "pandas.errors.DuplicateLabelError SA01" \
@@ -142,19 +133,15 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
142133
-i "pandas.errors.NullFrequencyError SA01" \
143134
-i "pandas.errors.NumExprClobberingError SA01" \
144135
-i "pandas.errors.NumbaUtilError SA01" \
145-
-i "pandas.errors.OptionError SA01" \
146136
-i "pandas.errors.OutOfBoundsTimedelta SA01" \
147137
-i "pandas.errors.PerformanceWarning SA01" \
148138
-i "pandas.errors.PossibleDataLossError SA01" \
149-
-i "pandas.errors.PossiblePrecisionLoss SA01" \
150139
-i "pandas.errors.UndefinedVariableError PR01,SA01" \
151140
-i "pandas.errors.UnsortedIndexError SA01" \
152-
-i "pandas.errors.UnsupportedFunctionCall SA01" \
153141
-i "pandas.errors.ValueLabelTypeMismatch SA01" \
154142
-i "pandas.infer_freq SA01" \
155143
-i "pandas.io.json.build_table_schema PR07,RT03,SA01" \
156144
-i "pandas.io.stata.StataWriter.write_file SA01" \
157-
-i "pandas.json_normalize RT03,SA01" \
158145
-i "pandas.plotting.andrews_curves RT03,SA01" \
159146
-i "pandas.plotting.scatter_matrix PR07,SA01" \
160147
-i "pandas.set_eng_float_format RT03,SA01" \
@@ -303,7 +290,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
303290
-i "pandas.tseries.offsets.Second.is_on_offset GL08" \
304291
-i "pandas.tseries.offsets.Second.n GL08" \
305292
-i "pandas.tseries.offsets.Second.normalize GL08" \
306-
-i "pandas.tseries.offsets.SemiMonthBegin SA01" \
307293
-i "pandas.tseries.offsets.SemiMonthBegin.day_of_month GL08" \
308294
-i "pandas.tseries.offsets.SemiMonthBegin.is_on_offset GL08" \
309295
-i "pandas.tseries.offsets.SemiMonthBegin.n GL08" \

ci/deps/actions-310.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies:
5252
- scipy>=1.10.0
5353
- sqlalchemy>=2.0.0
5454
- tabulate>=0.9.0
55-
- xarray>=2022.12.0
55+
- xarray>=2022.12.0, <=2024.9.0
5656
- xlrd>=2.0.1
5757
- xlsxwriter>=3.0.5
5858
- zstandard>=0.19.0

ci/deps/actions-311-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ dependencies:
5353
- scipy>=1.10.0
5454
- sqlalchemy>=2.0.0
5555
- tabulate>=0.9.0
56-
- xarray>=2022.12.0
56+
- xarray>=2022.12.0, <=2024.9.0
5757
- xlrd>=2.0.1
5858
- xlsxwriter>=3.0.5
5959
- zstandard>=0.19.0

ci/deps/actions-311.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies:
5252
- scipy>=1.10.0
5353
- sqlalchemy>=2.0.0
5454
- tabulate>=0.9.0
55-
- xarray>=2022.12.0
55+
- xarray>=2022.12.0, <=2024.9.0
5656
- xlrd>=2.0.1
5757
- xlsxwriter>=3.0.5
5858
- zstandard>=0.19.0

ci/deps/actions-312.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies:
5252
- scipy>=1.10.0
5353
- sqlalchemy>=2.0.0
5454
- tabulate>=0.9.0
55-
- xarray>=2022.12.0
55+
- xarray>=2022.12.0, <=2024.9.0
5656
- xlrd>=2.0.1
5757
- xlsxwriter>=3.0.5
5858
- zstandard>=0.19.0

ci/deps/circle-311-arm64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies:
5252
- scipy>=1.10.0
5353
- sqlalchemy>=2.0.0
5454
- tabulate>=0.9.0
55-
- xarray>=2022.12.0
55+
- xarray>=2022.12.0, <2024.10.0
5656
- xlrd>=2.0.1
5757
- xlsxwriter>=3.0.5
5858
- zstandard>=0.19.0

doc/source/development/contributing_codebase.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,12 @@ So, before actually writing any code, you should write your tests. Often the te
298298
taken from the original GitHub issue. However, it is always worth considering additional
299299
use cases and writing corresponding tests.
300300

301+
We use `code coverage <https://en.wikipedia.org/wiki/Code_coverage>`_ to help understand
302+
the amount of code which is covered by a test. We recommend striving to ensure code
303+
you add or change within Pandas is covered by a test. Please see our
304+
`code coverage dashboard through Codecov <https://app.codecov.io/github/pandas-dev/pandas>`_
305+
for more information.
306+
301307
Adding tests is one of the most common requests after code is pushed to pandas. Therefore,
302308
it is worth getting in the habit of writing tests ahead of time so this is never an issue.
303309

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dependencies:
5555
- scipy>=1.10.0
5656
- sqlalchemy>=2.0.0
5757
- tabulate>=0.9.0
58-
- xarray>=2022.12.0
58+
- xarray>=2022.12.0, <=2024.9.0
5959
- xlrd>=2.0.1
6060
- xlsxwriter>=3.0.5
6161
- zstandard>=0.19.0

pandas/_config/config.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ class OptionError(AttributeError, KeyError):
105105
106106
Backwards compatible with KeyError checks.
107107
108+
See Also
109+
--------
110+
options : Access and modify global pandas settings.
111+
108112
Examples
109113
--------
110114
>>> pd.options.context

0 commit comments

Comments
 (0)