Skip to content

Commit ffd15b7

Browse files
committed
Merge branch 'main' into add-mask-fillna
2 parents 0526b02 + 7f670c1 commit ffd15b7

File tree

153 files changed

+1448
-5334
lines changed

Some content is hidden

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

153 files changed

+1448
-5334
lines changed

.github/workflows/broken-linkcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
with:
2222
fetch-depth: 0
2323

.github/workflows/code-checks.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Checkout
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737
with:
3838
fetch-depth: 0
3939

@@ -114,7 +114,7 @@ jobs:
114114

115115
steps:
116116
- name: Checkout
117-
uses: actions/checkout@v4
117+
uses: actions/checkout@v5
118118
with:
119119
fetch-depth: 0
120120

@@ -148,7 +148,7 @@ jobs:
148148
run: docker image prune -f
149149

150150
- name: Checkout
151-
uses: actions/checkout@v4
151+
uses: actions/checkout@v5
152152
with:
153153
fetch-depth: 0
154154

@@ -169,7 +169,7 @@ jobs:
169169

170170
steps:
171171
- name: Checkout
172-
uses: actions/checkout@v4
172+
uses: actions/checkout@v5
173173
with:
174174
fetch-depth: 0
175175

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- python
2828

2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v5
3131
- uses: github/codeql-action/init@v3
3232
with:
3333
languages: ${{ matrix.language }}

.github/workflows/comment-commands.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949

5050
steps:
5151
- name: Checkout
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v5
5353
with:
5454
fetch-depth: 0
5555

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v5
4040
with:
4141
fetch-depth: 0
4242

.github/workflows/package-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v5
3838
with:
3939
fetch-depth: 0
4040

@@ -58,7 +58,7 @@ jobs:
5858
cancel-in-progress: true
5959
steps:
6060
- name: Checkout
61-
uses: actions/checkout@v4
61+
uses: actions/checkout@v5
6262
with:
6363
fetch-depth: 0
6464

.github/workflows/unit-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139

140140
steps:
141141
- name: Checkout
142-
uses: actions/checkout@v4
142+
uses: actions/checkout@v5
143143
with:
144144
fetch-depth: 0
145145

@@ -199,7 +199,7 @@ jobs:
199199

200200
steps:
201201
- name: Checkout
202-
uses: actions/checkout@v4
202+
uses: actions/checkout@v5
203203
with:
204204
fetch-depth: 0
205205

@@ -338,7 +338,7 @@ jobs:
338338
PYTEST_TARGET: pandas
339339

340340
steps:
341-
- uses: actions/checkout@v4
341+
- uses: actions/checkout@v5
342342
with:
343343
fetch-depth: 0
344344

@@ -375,7 +375,7 @@ jobs:
375375
cancel-in-progress: true
376376
steps:
377377
- name: Checkout pandas Repo
378-
uses: actions/checkout@v4
378+
uses: actions/checkout@v5
379379
with:
380380
fetch-depth: 0
381381

.github/workflows/wheels.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
sdist_file: ${{ steps.save-path.outputs.sdist_name }}
4949
steps:
5050
- name: Checkout pandas
51-
uses: actions/checkout@v4
51+
uses: actions/checkout@v5
5252
with:
5353
fetch-depth: 0
5454

@@ -119,7 +119,7 @@ jobs:
119119
IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
120120
steps:
121121
- name: Checkout pandas
122-
uses: actions/checkout@v4
122+
uses: actions/checkout@v5
123123
with:
124124
fetch-depth: 0
125125

@@ -137,7 +137,7 @@ jobs:
137137
# removes unnecessary files from the release
138138
- name: Download sdist (not macOS)
139139
#if: ${{ matrix.buildplat[1] != 'macosx_*' }}
140-
uses: actions/download-artifact@v4
140+
uses: actions/download-artifact@v5
141141
with:
142142
name: sdist
143143
path: ./dist
@@ -160,7 +160,7 @@ jobs:
160160
run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
161161

162162
- name: Build wheels
163-
uses: pypa/cibuildwheel@v3.1.3
163+
uses: pypa/cibuildwheel@v3.1.4
164164
with:
165165
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
166166
env:

.pre-commit-config.yaml

Lines changed: 11 additions & 8 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.12.7
22+
rev: v0.12.11
2323
hooks:
2424
- id: ruff
2525
args: [--exit-non-zero-on-fix]
@@ -51,7 +51,7 @@ repos:
5151
- id: cython-lint
5252
- id: double-quote-cython-strings
5353
- repo: https://github.com/pre-commit/pre-commit-hooks
54-
rev: v5.0.0
54+
rev: v6.0.0
5555
hooks:
5656
- id: check-case-conflict
5757
- id: check-toml
@@ -64,8 +64,6 @@ repos:
6464
args: [--fix=auto]
6565
exclude: ^pandas/tests/io/parser/data/utf16_ex.txt$
6666
- id: fix-byte-order-marker
67-
- id: fix-encoding-pragma
68-
args: [--remove]
6967
- id: trailing-whitespace
7068
args: [--markdown-linebreak-ext=md]
7169
- repo: https://github.com/PyCQA/isort
@@ -94,19 +92,19 @@ repos:
9492
- id: sphinx-lint
9593
args: ["--enable", "all", "--disable", "line-too-long"]
9694
- repo: https://github.com/pre-commit/mirrors-clang-format
97-
rev: v20.1.8
95+
rev: v21.1.0
9896
hooks:
9997
- id: clang-format
10098
files: ^pandas/_libs/src|^pandas/_libs/include
10199
args: [-i]
102100
types_or: [c, c++]
103101
- repo: https://github.com/trim21/pre-commit-mirror-meson
104-
rev: v1.8.3
102+
rev: v1.9.0
105103
hooks:
106104
- id: meson-fmt
107105
args: ['--inplace']
108106
- repo: https://github.com/shellcheck-py/shellcheck-py
109-
rev: v0.10.0.1
107+
rev: v0.11.0.1
110108
hooks:
111109
- id: shellcheck
112110
args: ["--severity=warning"]
@@ -121,7 +119,7 @@ repos:
121119
types: [python]
122120
stages: [manual]
123121
additional_dependencies: &pyright_dependencies
124-
- pyright@1.1.383
122+
- pyright@1.1.404
125123
- id: pyright
126124
# note: assumes python env is setup and activated
127125
name: pyright reportGeneralTypeIssues
@@ -266,6 +264,11 @@ repos:
266264
language: python
267265
entry: python scripts/validate_unwanted_patterns.py --validation-type="nodefault_used_not_only_for_typing"
268266
types: [python]
267+
- id: unwanted-patterns-doesnt-use-pandas-warnings
268+
name: Check that warning classes for deprecations use pandas' warning classes
269+
language: python
270+
entry: python scripts/validate_unwanted_patterns.py --validation-type="doesnt_use_pandas_warnings"
271+
types: [ python ]
269272
- id: no-return-exception
270273
name: Use raise instead of return for exceptions
271274
language: pygrep

asv_bench/benchmarks/strings.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
DataFrame,
99
Index,
1010
Series,
11+
StringDtype,
1112
)
1213
from pandas.arrays import StringArray
1314

@@ -290,10 +291,10 @@ def setup(self):
290291
self.series_arr_nan = np.concatenate([self.series_arr, np.array([NA] * 1000)])
291292

292293
def time_string_array_construction(self):
293-
StringArray(self.series_arr)
294+
StringArray(self.series_arr, dtype=StringDtype())
294295

295296
def time_string_array_with_nan_construction(self):
296-
StringArray(self.series_arr_nan)
297+
StringArray(self.series_arr_nan, dtype=StringDtype())
297298

298299
def peakmem_stringarray_construction(self):
299-
StringArray(self.series_arr)
300+
StringArray(self.series_arr, dtype=StringDtype())

0 commit comments

Comments
 (0)