Skip to content

Commit 1f0553b

Browse files
authored
Merge branch 'main' into dependabot/github_actions/pypa/cibuildwheel-2.21.0
2 parents c0318fa + 4f328f0 commit 1f0553b

File tree

105 files changed

+2030
-1119
lines changed

Some content is hidden

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

105 files changed

+2030
-1119
lines changed

.github/actions/setup-conda/action.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ runs:
99
- name: Install ${{ inputs.environment-file }}
1010
uses: mamba-org/setup-micromamba@v1
1111
with:
12+
# Pinning to avoid 2.0 failures
13+
micromamba-version: '1.5.10-0'
1214
environment-file: ${{ inputs.environment-file }}
1315
environment-name: test
1416
condarc-file: ci/.condarc

.github/workflows/code-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212

1313
env:
1414
ENV_FILE: environment.yml

.github/workflows/docbuild-and-upload.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
tags:
99
- '*'
1010
pull_request:
1111
branches:
1212
- main
13-
- 2.2.x
13+
- 2.3.x
1414

1515
env:
1616
ENV_FILE: environment.yml

.github/workflows/package-checks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212
types: [ labeled, opened, synchronize, reopened ]
1313

1414
permissions:
@@ -67,7 +67,7 @@ jobs:
6767
fetch-depth: 0
6868

6969
- name: Set up Python
70-
uses: mamba-org/setup-micromamba@v1
70+
uses: mamba-org/setup-micromamba@v2
7171
with:
7272
environment-name: recipe-test
7373
create-args: >-

.github/workflows/unit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212
paths-ignore:
1313
- "doc/**"
1414
- "web/**"

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
CIBW_PLATFORM: ${{ matrix.buildplat[1] == 'pyodide_wasm32' && 'pyodide' || 'auto' }}
166166

167167
- name: Set up Python
168-
uses: mamba-org/setup-micromamba@v1
168+
uses: mamba-org/setup-micromamba@v2
169169
with:
170170
environment-name: wheel-env
171171
# Use a fixed Python, since we might have an unreleased Python not

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ci:
1919
skip: [pyright, mypy]
2020
repos:
2121
- repo: https://github.com/astral-sh/ruff-pre-commit
22-
rev: v0.5.0
22+
rev: v0.6.9
2323
hooks:
2424
- id: ruff
2525
args: [--exit-non-zero-on-fix]
@@ -34,7 +34,7 @@ repos:
3434
- id: ruff-format
3535
exclude: ^scripts|^pandas/tests/frame/test_query_eval.py
3636
- repo: https://github.com/jendrikseipp/vulture
37-
rev: 'v2.11'
37+
rev: 'v2.13'
3838
hooks:
3939
- id: vulture
4040
entry: python scripts/run_vulture.py
@@ -52,7 +52,7 @@ repos:
5252
- id: cython-lint
5353
- id: double-quote-cython-strings
5454
- repo: https://github.com/pre-commit/pre-commit-hooks
55-
rev: v4.6.0
55+
rev: v5.0.0
5656
hooks:
5757
- id: check-case-conflict
5858
- id: check-toml
@@ -90,12 +90,12 @@ repos:
9090
types: [text] # overwrite types: [rst]
9191
types_or: [python, rst]
9292
- repo: https://github.com/sphinx-contrib/sphinx-lint
93-
rev: v0.9.1
93+
rev: v1.0.0
9494
hooks:
9595
- id: sphinx-lint
9696
args: ["--enable", "all", "--disable", "line-too-long"]
9797
- repo: https://github.com/pre-commit/mirrors-clang-format
98-
rev: v18.1.8
98+
rev: v19.1.1
9999
hooks:
100100
- id: clang-format
101101
files: ^pandas/_libs/src|^pandas/_libs/include

ci/code_checks.sh

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -73,53 +73,23 @@ 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-
-i "pandas.Series.cat.add_categories PR01,PR02" \
77-
-i "pandas.Series.cat.as_ordered PR01" \
78-
-i "pandas.Series.cat.as_unordered PR01" \
79-
-i "pandas.Series.cat.remove_categories PR01,PR02" \
80-
-i "pandas.Series.cat.remove_unused_categories PR01" \
81-
-i "pandas.Series.cat.rename_categories PR01,PR02" \
82-
-i "pandas.Series.cat.reorder_categories PR01,PR02" \
83-
-i "pandas.Series.cat.set_categories PR01,PR02" \
84-
-i "pandas.Series.dt.as_unit PR01,PR02" \
85-
-i "pandas.Series.dt.ceil PR01,PR02" \
86-
-i "pandas.Series.dt.day_name PR01,PR02" \
87-
-i "pandas.Series.dt.floor PR01,PR02" \
8876
-i "pandas.Series.dt.freq GL08" \
89-
-i "pandas.Series.dt.month_name PR01,PR02" \
90-
-i "pandas.Series.dt.normalize PR01" \
91-
-i "pandas.Series.dt.round PR01,PR02" \
92-
-i "pandas.Series.dt.strftime PR01,PR02" \
93-
-i "pandas.Series.dt.to_period PR01,PR02" \
94-
-i "pandas.Series.dt.total_seconds PR01" \
95-
-i "pandas.Series.dt.tz_convert PR01,PR02" \
96-
-i "pandas.Series.dt.tz_localize PR01,PR02" \
9777
-i "pandas.Series.dt.unit GL08" \
9878
-i "pandas.Series.pad PR01,SA01" \
99-
-i "pandas.Series.sparse.from_coo PR07,SA01" \
100-
-i "pandas.Series.sparse.npoints SA01" \
10179
-i "pandas.Timedelta.max PR02" \
10280
-i "pandas.Timedelta.min PR02" \
10381
-i "pandas.Timedelta.resolution PR02" \
104-
-i "pandas.TimedeltaIndex.to_pytimedelta RT03,SA01" \
10582
-i "pandas.Timestamp.max PR02" \
10683
-i "pandas.Timestamp.min PR02" \
10784
-i "pandas.Timestamp.nanosecond GL08" \
10885
-i "pandas.Timestamp.resolution PR02" \
10986
-i "pandas.Timestamp.tzinfo GL08" \
11087
-i "pandas.Timestamp.year GL08" \
111-
-i "pandas.api.types.is_dict_like PR07,SA01" \
112-
-i "pandas.api.types.is_file_like PR07,SA01" \
113-
-i "pandas.api.types.is_float PR01,SA01" \
114-
-i "pandas.api.types.is_hashable PR01,RT03,SA01" \
11588
-i "pandas.api.types.is_integer PR01,SA01" \
11689
-i "pandas.api.types.is_iterator PR07,SA01" \
117-
-i "pandas.api.types.is_named_tuple PR07,SA01" \
118-
-i "pandas.api.types.is_re PR07,SA01" \
11990
-i "pandas.api.types.is_re_compilable PR07,SA01" \
12091
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
12192
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
122-
-i "pandas.arrays.DatetimeArray SA01" \
12393
-i "pandas.arrays.IntegerArray SA01" \
12494
-i "pandas.arrays.IntervalArray.left SA01" \
12595
-i "pandas.arrays.IntervalArray.length SA01" \
@@ -128,8 +98,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
12898
-i "pandas.arrays.SparseArray PR07,SA01" \
12999
-i "pandas.arrays.TimedeltaArray PR07,SA01" \
130100
-i "pandas.core.groupby.DataFrameGroupBy.__iter__ RT03,SA01" \
131-
-i "pandas.core.groupby.DataFrameGroupBy.agg RT03" \
132-
-i "pandas.core.groupby.DataFrameGroupBy.aggregate RT03" \
133101
-i "pandas.core.groupby.DataFrameGroupBy.boxplot PR07,RT03,SA01" \
134102
-i "pandas.core.groupby.DataFrameGroupBy.get_group RT03,SA01" \
135103
-i "pandas.core.groupby.DataFrameGroupBy.groups SA01" \
@@ -140,8 +108,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
140108
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
141109
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
142110
-i "pandas.core.groupby.SeriesGroupBy.__iter__ RT03,SA01" \
143-
-i "pandas.core.groupby.SeriesGroupBy.agg RT03" \
144-
-i "pandas.core.groupby.SeriesGroupBy.aggregate RT03" \
145111
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
146112
-i "pandas.core.groupby.SeriesGroupBy.groups SA01" \
147113
-i "pandas.core.groupby.SeriesGroupBy.indices SA01" \
@@ -168,42 +134,30 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
168134
-i "pandas.core.resample.Resampler.var SA01" \
169135
-i "pandas.errors.AttributeConflictWarning SA01" \
170136
-i "pandas.errors.CSSWarning SA01" \
171-
-i "pandas.errors.CategoricalConversionWarning SA01" \
172137
-i "pandas.errors.ChainedAssignmentError SA01" \
173-
-i "pandas.errors.ClosedFileError SA01" \
174138
-i "pandas.errors.DataError SA01" \
175139
-i "pandas.errors.DuplicateLabelError SA01" \
176-
-i "pandas.errors.EmptyDataError SA01" \
177140
-i "pandas.errors.IntCastingNaNError SA01" \
178141
-i "pandas.errors.InvalidIndexError SA01" \
179-
-i "pandas.errors.InvalidVersion SA01" \
180142
-i "pandas.errors.NullFrequencyError SA01" \
181143
-i "pandas.errors.NumExprClobberingError SA01" \
182144
-i "pandas.errors.NumbaUtilError SA01" \
183145
-i "pandas.errors.OptionError SA01" \
184-
-i "pandas.errors.OutOfBoundsDatetime SA01" \
185146
-i "pandas.errors.OutOfBoundsTimedelta SA01" \
186147
-i "pandas.errors.PerformanceWarning SA01" \
187148
-i "pandas.errors.PossibleDataLossError SA01" \
188149
-i "pandas.errors.PossiblePrecisionLoss SA01" \
189-
-i "pandas.errors.SpecificationError SA01" \
190150
-i "pandas.errors.UndefinedVariableError PR01,SA01" \
191151
-i "pandas.errors.UnsortedIndexError SA01" \
192152
-i "pandas.errors.UnsupportedFunctionCall SA01" \
193153
-i "pandas.errors.ValueLabelTypeMismatch SA01" \
194154
-i "pandas.infer_freq SA01" \
195155
-i "pandas.io.json.build_table_schema PR07,RT03,SA01" \
196-
-i "pandas.io.stata.StataReader.data_label SA01" \
197-
-i "pandas.io.stata.StataReader.value_labels RT03,SA01" \
198-
-i "pandas.io.stata.StataReader.variable_labels RT03,SA01" \
199156
-i "pandas.io.stata.StataWriter.write_file SA01" \
200157
-i "pandas.json_normalize RT03,SA01" \
201-
-i "pandas.period_range RT03,SA01" \
202158
-i "pandas.plotting.andrews_curves RT03,SA01" \
203-
-i "pandas.plotting.lag_plot RT03,SA01" \
204159
-i "pandas.plotting.scatter_matrix PR07,SA01" \
205160
-i "pandas.set_eng_float_format RT03,SA01" \
206-
-i "pandas.testing.assert_extension_array_equal SA01" \
207161
-i "pandas.tseries.offsets.BDay PR02,SA01" \
208162
-i "pandas.tseries.offsets.BQuarterBegin.is_on_offset GL08" \
209163
-i "pandas.tseries.offsets.BQuarterBegin.n GL08" \

doc/source/development/contributing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,15 +305,15 @@ It is important to periodically update your local ``main`` branch with updates f
305305
branch and update your development environment to reflect any changes to the various packages that
306306
are used during development.
307307

308-
If using :ref:`mamba <contributing.mamba>`, run:
308+
If using :ref:`conda <contributing.conda>`, run:
309309

310310
.. code-block:: shell
311311
312312
git checkout main
313313
git fetch upstream
314314
git merge upstream/main
315-
mamba activate pandas-dev
316-
mamba env update -f environment.yml --prune
315+
conda activate pandas-dev
316+
conda env update -f environment.yml --prune
317317
318318
If using :ref:`pip <contributing.pip>` , do:
319319

doc/source/development/contributing_codebase.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ in your python environment.
244244

245245
.. warning::
246246

247-
* Please be aware that the above commands will use the current python environment. If your python packages are older/newer than those installed by the pandas CI, the above commands might fail. This is often the case when the ``mypy`` or ``numpy`` versions do not match. Please see :ref:`how to setup the python environment <contributing.mamba>` or select a `recently succeeded workflow <https://github.com/pandas-dev/pandas/actions/workflows/code-checks.yml?query=branch%3Amain+is%3Asuccess>`_, select the "Docstring validation, typing, and other manual pre-commit hooks" job, then click on "Set up Conda" and "Environment info" to see which versions the pandas CI installs.
247+
* Please be aware that the above commands will use the current python environment. If your python packages are older/newer than those installed by the pandas CI, the above commands might fail. This is often the case when the ``mypy`` or ``numpy`` versions do not match. Please see :ref:`how to setup the python environment <contributing.conda>` or select a `recently succeeded workflow <https://github.com/pandas-dev/pandas/actions/workflows/code-checks.yml?query=branch%3Amain+is%3Asuccess>`_, select the "Docstring validation, typing, and other manual pre-commit hooks" job, then click on "Set up Conda" and "Environment info" to see which versions the pandas CI installs.
248248

249249
.. _contributing.ci:
250250

0 commit comments

Comments
 (0)