Skip to content

Commit ea1b48d

Browse files
committed
Merge branch 'main' into tst-string-xfails
2 parents 01521dd + 7c2796d commit ea1b48d

File tree

78 files changed

+890
-522
lines changed

Some content is hidden

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

78 files changed

+890
-522
lines changed

.pre-commit-config.yaml

Lines changed: 4 additions & 4 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.11.12
22+
rev: v0.12.2
2323
hooks:
2424
- id: ruff
2525
args: [--exit-non-zero-on-fix]
@@ -47,7 +47,7 @@ repos:
4747
types_or: [python, rst, markdown, cython, c]
4848
additional_dependencies: [tomli]
4949
- repo: https://github.com/MarcoGorelli/cython-lint
50-
rev: v0.16.6
50+
rev: v0.16.7
5151
hooks:
5252
- id: cython-lint
5353
- id: double-quote-cython-strings
@@ -95,14 +95,14 @@ repos:
9595
- id: sphinx-lint
9696
args: ["--enable", "all", "--disable", "line-too-long"]
9797
- repo: https://github.com/pre-commit/mirrors-clang-format
98-
rev: v20.1.5
98+
rev: v20.1.7
9999
hooks:
100100
- id: clang-format
101101
files: ^pandas/_libs/src|^pandas/_libs/include
102102
args: [-i]
103103
types_or: [c, c++]
104104
- repo: https://github.com/trim21/pre-commit-mirror-meson
105-
rev: v1.8.1
105+
rev: v1.8.2
106106
hooks:
107107
- id: meson-fmt
108108
args: ['--inplace']

asv_bench/benchmarks/gil.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from .pandas_vb_common import BaseIO # isort:skip
3737

3838

39-
def test_parallel(num_threads=2, kwargs_list=None):
39+
def run_parallel(num_threads=2, kwargs_list=None):
4040
"""
4141
Decorator to run the same function multiple times in parallel.
4242
@@ -95,7 +95,7 @@ def setup(self, threads, method):
9595
{"key": np.random.randint(0, ngroups, size=N), "data": np.random.randn(N)}
9696
)
9797

98-
@test_parallel(num_threads=threads)
98+
@run_parallel(num_threads=threads)
9999
def parallel():
100100
getattr(df.groupby("key")["data"], method)()
101101

@@ -123,7 +123,7 @@ def setup(self, threads):
123123
ngroups = 10**3
124124
data = Series(np.random.randint(0, ngroups, size=size))
125125

126-
@test_parallel(num_threads=threads)
126+
@run_parallel(num_threads=threads)
127127
def get_groups():
128128
data.groupby(data).groups
129129

@@ -142,7 +142,7 @@ def setup(self, dtype):
142142
df = DataFrame({"col": np.arange(N, dtype=dtype)})
143143
indexer = np.arange(100, len(df) - 100)
144144

145-
@test_parallel(num_threads=2)
145+
@run_parallel(num_threads=2)
146146
def parallel_take1d():
147147
take_nd(df["col"].values, indexer)
148148

@@ -163,7 +163,7 @@ def setup(self):
163163
k = 5 * 10**5
164164
kwargs_list = [{"arr": np.random.randn(N)}, {"arr": np.random.randn(N)}]
165165

166-
@test_parallel(num_threads=2, kwargs_list=kwargs_list)
166+
@run_parallel(num_threads=2, kwargs_list=kwargs_list)
167167
def parallel_kth_smallest(arr):
168168
algos.kth_smallest(arr, k)
169169

@@ -180,42 +180,42 @@ def setup(self):
180180
self.period = self.dti.to_period("D")
181181

182182
def time_datetime_field_year(self):
183-
@test_parallel(num_threads=2)
183+
@run_parallel(num_threads=2)
184184
def run(dti):
185185
dti.year
186186

187187
run(self.dti)
188188

189189
def time_datetime_field_day(self):
190-
@test_parallel(num_threads=2)
190+
@run_parallel(num_threads=2)
191191
def run(dti):
192192
dti.day
193193

194194
run(self.dti)
195195

196196
def time_datetime_field_daysinmonth(self):
197-
@test_parallel(num_threads=2)
197+
@run_parallel(num_threads=2)
198198
def run(dti):
199199
dti.days_in_month
200200

201201
run(self.dti)
202202

203203
def time_datetime_field_normalize(self):
204-
@test_parallel(num_threads=2)
204+
@run_parallel(num_threads=2)
205205
def run(dti):
206206
dti.normalize()
207207

208208
run(self.dti)
209209

210210
def time_datetime_to_period(self):
211-
@test_parallel(num_threads=2)
211+
@run_parallel(num_threads=2)
212212
def run(dti):
213213
dti.to_period("s")
214214

215215
run(self.dti)
216216

217217
def time_period_to_datetime(self):
218-
@test_parallel(num_threads=2)
218+
@run_parallel(num_threads=2)
219219
def run(period):
220220
period.to_timestamp()
221221

@@ -232,7 +232,7 @@ def setup(self, method):
232232
if hasattr(DataFrame, "rolling"):
233233
df = DataFrame(arr).rolling(win)
234234

235-
@test_parallel(num_threads=2)
235+
@run_parallel(num_threads=2)
236236
def parallel_rolling():
237237
getattr(df, method)()
238238

@@ -249,7 +249,7 @@ def parallel_rolling():
249249
"std": rolling_std,
250250
}
251251

252-
@test_parallel(num_threads=2)
252+
@run_parallel(num_threads=2)
253253
def parallel_rolling():
254254
rolling[method](arr, win)
255255

@@ -286,7 +286,7 @@ def setup(self, dtype):
286286
self.fname = f"__test_{dtype}__.csv"
287287
df.to_csv(self.fname)
288288

289-
@test_parallel(num_threads=2)
289+
@run_parallel(num_threads=2)
290290
def parallel_read_csv():
291291
read_csv(self.fname)
292292

@@ -305,7 +305,7 @@ class ParallelFactorize:
305305
def setup(self, threads):
306306
strings = Index([f"i-{i}" for i in range(100000)], dtype=object)
307307

308-
@test_parallel(num_threads=threads)
308+
@run_parallel(num_threads=threads)
309309
def parallel():
310310
factorize(strings)
311311

ci/deps/actions-310-minimum_versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dependencies:
4141
- qtpy=2.3.0
4242
- openpyxl=3.1.2
4343
- psycopg2=2.9.6
44-
- pyarrow=10.0.1
44+
- pyarrow=12.0.1
4545
- pyiceberg=0.7.1
4646
- pymysql=1.1.0
4747
- pyqt=5.15.9

ci/deps/actions-310.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies:
3939
- qtpy>=2.3.0
4040
- openpyxl>=3.1.2
4141
- psycopg2>=2.9.6
42-
- pyarrow>=10.0.1
42+
- pyarrow>=12.0.1
4343
- pyiceberg>=0.7.1
4444
- pymysql>=1.1.0
4545
- pyqt>=5.15.9

ci/deps/actions-311-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- qtpy>=2.3.0
4141
- openpyxl>=3.1.2
4242
- psycopg2>=2.9.6
43-
- pyarrow>=10.0.1
43+
- pyarrow>=12.0.1
4444
- pyiceberg>=0.7.1
4545
- pymysql>=1.1.0
4646
- pyqt>=5.15.9

ci/deps/actions-311.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- pyqt>=5.15.9
4141
- openpyxl>=3.1.2
4242
- psycopg2>=2.9.6
43-
- pyarrow>=10.0.1
43+
- pyarrow>=12.0.1
4444
- pyiceberg>=0.7.1
4545
- pymysql>=1.1.0
4646
- pyreadstat>=1.2.6

ci/deps/actions-312.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- pyqt>=5.15.9
4141
- openpyxl>=3.1.2
4242
- psycopg2>=2.9.6
43-
- pyarrow>=10.0.1
43+
- pyarrow>=12.0.1
4444
- pyiceberg>=0.7.1
4545
- pymysql>=1.1.0
4646
- pyreadstat>=1.2.6

ci/deps/actions-313.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dependencies:
4141
- pyqt>=5.15.9
4242
- openpyxl>=3.1.2
4343
- psycopg2>=2.9.6
44-
- pyarrow>=10.0.1
44+
- pyarrow>=12.0.1
4545
- pymysql>=1.1.0
4646
- pyreadstat>=1.2.6
4747
- pytables>=3.8.0

doc/source/getting_started/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ Dependency Minimum Version pip ex
307307
`PyTables <https://github.com/PyTables/PyTables>`__ 3.8.0 hdf5 HDF5-based reading / writing
308308
`zlib <https://github.com/madler/zlib>`__ hdf5 Compression for HDF5
309309
`fastparquet <https://github.com/dask/fastparquet>`__ 2024.2.0 - Parquet reading / writing (pyarrow is default)
310-
`pyarrow <https://github.com/apache/arrow>`__ 10.0.1 parquet, feather Parquet, ORC, and feather reading / writing
310+
`pyarrow <https://github.com/apache/arrow>`__ 12.0.1 parquet, feather Parquet, ORC, and feather reading / writing
311311
`PyIceberg <https://py.iceberg.apache.org/>`__ 0.7.1 iceberg Apache Iceberg reading / writing
312312
`pyreadstat <https://github.com/Roche/pyreadstat>`__ 1.2.6 spss SPSS files (.sav) reading
313313
`odfpy <https://github.com/eea/odfpy>`__ 1.4.1 excel Open document format (.odf, .ods, .odt) reading / writing

doc/source/user_guide/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,6 @@ Guides
8787
enhancingperf
8888
scale
8989
sparse
90+
migration-3-strings
9091
gotchas
9192
cookbook

0 commit comments

Comments
 (0)