Skip to content

Commit 9cae3f7

Browse files
Merge branch 'main' into main
2 parents 9dc6858 + d5f97ed commit 9cae3f7

File tree

78 files changed

+964
-435
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

+964
-435
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

asv_bench/benchmarks/io/csv.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,25 @@ def time_frame(self, kind):
5353
self.df.to_csv(self.fname)
5454

5555

56+
class ToCSVFloatFormatVariants(BaseIO):
57+
fname = "__test__.csv"
58+
59+
def setup(self):
60+
self.df = DataFrame(np.random.default_rng(seed=42).random((1000, 1000)))
61+
62+
def time_old_style_percent_format(self):
63+
self.df.to_csv(self.fname, float_format="%.6f")
64+
65+
def time_new_style_brace_format(self):
66+
self.df.to_csv(self.fname, float_format="{:.6f}")
67+
68+
def time_new_style_thousands_format(self):
69+
self.df.to_csv(self.fname, float_format="{:,.2f}")
70+
71+
def time_callable_format(self):
72+
self.df.to_csv(self.fname, float_format=lambda x: f"{x:.6f}")
73+
74+
5675
class ToCSVMultiIndexUnusedLevels(BaseIO):
5776
fname = "__test__.csv"
5877

ci/deps/actions-310-minimum_versions.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies:
2222

2323
# required dependencies
2424
- python-dateutil=2.8.2
25-
- numpy=1.23.5
25+
- numpy=1.26.0
2626

2727
# optional dependencies
2828
- beautifulsoup4=4.12.3
@@ -62,4 +62,4 @@ dependencies:
6262
- pip:
6363
- adbc-driver-postgresql==0.10.0
6464
- adbc-driver-sqlite==0.8.0
65-
- tzdata==2022.7
65+
- tzdata==2023.3

ci/deps/actions-310.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ dependencies:
6060
- pip:
6161
- adbc-driver-postgresql>=0.10.0
6262
- adbc-driver-sqlite>=0.8.0
63-
- tzdata>=2022.7
63+
- tzdata>=2023.3

ci/deps/actions-311-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ dependencies:
7373
- pip:
7474
- adbc-driver-postgresql>=0.10.0
7575
- adbc-driver-sqlite>=0.8.0
76-
- tzdata>=2022.7
76+
- tzdata>=2023.3

ci/deps/actions-311-numpydev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ dependencies:
2424
- "--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
2525
- "--pre"
2626
- "numpy"
27-
- "tzdata>=2022.7"
27+
- "tzdata>=2023.3"

ci/deps/actions-311-pyarrownightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies:
2222
- pip
2323

2424
- pip:
25-
- "tzdata>=2022.7"
25+
- "tzdata>=2023.3"
2626
- "--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
2727
- "--prefer-binary"
2828
- "--pre"

ci/deps/actions-312.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ dependencies:
6060
- pip:
6161
- adbc-driver-postgresql>=0.10.0
6262
- adbc-driver-sqlite>=0.8.0
63-
- tzdata>=2022.7
63+
- tzdata>=2023.3

ci/deps/actions-313-freethreading.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ dependencies:
2525
- pip:
2626
# No free-threaded coveragepy (with the C-extension) on conda-forge yet
2727
- pytest-cov
28-
- "tzdata>=2022.7"
28+
- tzdata>=2023.3
2929
- "--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"

0 commit comments

Comments
 (0)