Skip to content

Commit c1ed1f0

Browse files
committed
resolved conflicts and updated main with latest changes
1 parent a5b3882 commit c1ed1f0

39 files changed

+746
-461
lines changed

.github/workflows/package-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/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 & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -73,30 +73,9 @@ 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" \
10079
-i "pandas.Timedelta.max PR02" \
10180
-i "pandas.Timedelta.min PR02" \
10281
-i "pandas.Timedelta.resolution PR02" \
@@ -106,13 +85,11 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
10685
-i "pandas.Timestamp.resolution PR02" \
10786
-i "pandas.Timestamp.tzinfo GL08" \
10887
-i "pandas.Timestamp.year GL08" \
109-
-i "pandas.api.types.is_float PR01,SA01" \
11088
-i "pandas.api.types.is_integer PR01,SA01" \
11189
-i "pandas.api.types.is_iterator PR07,SA01" \
11290
-i "pandas.api.types.is_re_compilable PR07,SA01" \
11391
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
11492
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
115-
-i "pandas.arrays.DatetimeArray SA01" \
11693
-i "pandas.arrays.IntegerArray SA01" \
11794
-i "pandas.arrays.IntervalArray.left SA01" \
11895
-i "pandas.arrays.IntervalArray.length SA01" \
@@ -163,7 +140,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
163140
-i "pandas.errors.DuplicateLabelError SA01" \
164141
-i "pandas.errors.IntCastingNaNError SA01" \
165142
-i "pandas.errors.InvalidIndexError SA01" \
166-
-i "pandas.errors.InvalidVersion SA01" \
167143
-i "pandas.errors.NullFrequencyError SA01" \
168144
-i "pandas.errors.NumExprClobberingError SA01" \
169145
-i "pandas.errors.NumbaUtilError SA01" \
@@ -172,24 +148,18 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
172148
-i "pandas.errors.PerformanceWarning SA01" \
173149
-i "pandas.errors.PossibleDataLossError SA01" \
174150
-i "pandas.errors.PossiblePrecisionLoss SA01" \
175-
-i "pandas.errors.SpecificationError SA01" \
176151
-i "pandas.errors.UndefinedVariableError PR01,SA01" \
177152
-i "pandas.errors.UnsortedIndexError SA01" \
178153
-i "pandas.errors.UnsupportedFunctionCall SA01" \
179154
-i "pandas.errors.ValueLabelTypeMismatch SA01" \
180155
-i "pandas.infer_freq SA01" \
181156
-i "pandas.io.json.build_table_schema PR07,RT03,SA01" \
182-
-i "pandas.io.stata.StataReader.data_label SA01" \
183-
-i "pandas.io.stata.StataReader.value_labels RT03,SA01" \
184157
-i "pandas.io.stata.StataReader.variable_labels RT03,SA01" \
185158
-i "pandas.io.stata.StataWriter.write_file SA01" \
186159
-i "pandas.json_normalize RT03,SA01" \
187-
-i "pandas.period_range RT03,SA01" \
188160
-i "pandas.plotting.andrews_curves RT03,SA01" \
189-
-i "pandas.plotting.lag_plot RT03,SA01" \
190161
-i "pandas.plotting.scatter_matrix PR07,SA01" \
191162
-i "pandas.set_eng_float_format RT03,SA01" \
192-
-i "pandas.testing.assert_extension_array_equal SA01" \
193163
-i "pandas.tseries.offsets.BDay PR02,SA01" \
194164
-i "pandas.tseries.offsets.BQuarterBegin.is_on_offset GL08" \
195165
-i "pandas.tseries.offsets.BQuarterBegin.n GL08" \

0 commit comments

Comments
 (0)