Skip to content

Commit 758207b

Browse files
authored
Merge branch 'main' into stata-read-dta104
2 parents 7402e4d + b0c4194 commit 758207b

File tree

205 files changed

+3095
-3426
lines changed

Some content is hidden

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

205 files changed

+3095
-3426
lines changed

.github/workflows/cache-cleanup-weekly.yml renamed to .github/workflows/cache-cleanup-daily.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Purge caches once a week
1+
name: Purge caches daily
22
on:
33
schedule:
4-
# 4:10 UTC on Sunday
5-
- cron: "10 4 * * 0"
4+
# 4:10 UTC daily
5+
- cron: "10 4 * * *"
66

77
jobs:
88
cleanup:

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
141141

142142
- name: Build wheels
143-
uses: pypa/cibuildwheel@v2.17.0
143+
uses: pypa/cibuildwheel@v2.18.1
144144
with:
145145
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
146146
env:

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ repos:
9090
rev: v0.9.1
9191
hooks:
9292
- id: sphinx-lint
93+
args: ["--enable", "all", "--disable", "line-too-long"]
9394
- repo: https://github.com/pre-commit/mirrors-clang-format
9495
rev: v18.1.4
9596
hooks:

LICENSES/XARRAY_LICENSE

Lines changed: 0 additions & 191 deletions
This file was deleted.

asv_bench/benchmarks/io/csv.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -445,16 +445,6 @@ def setup(self, engine):
445445
data = data.format(*two_cols)
446446
self.StringIO_input = StringIO(data)
447447

448-
def time_multiple_date(self, engine):
449-
read_csv(
450-
self.data(self.StringIO_input),
451-
engine=engine,
452-
sep=",",
453-
header=None,
454-
names=list(string.digits[:9]),
455-
parse_dates=[[1, 2], [1, 3]],
456-
)
457-
458448
def time_baseline(self, engine):
459449
read_csv(
460450
self.data(self.StringIO_input),

asv_bench/benchmarks/io/parsers.py

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
import numpy as np
2-
31
try:
4-
from pandas._libs.tslibs.parsing import (
5-
_does_string_look_like_datetime,
6-
concat_date_cols,
7-
)
2+
from pandas._libs.tslibs.parsing import _does_string_look_like_datetime
83
except ImportError:
94
# Avoid whole benchmark suite import failure on asv (currently 0.4)
105
pass
@@ -20,21 +15,3 @@ def setup(self, value):
2015
def time_check_datetimes(self, value):
2116
for obj in self.objects:
2217
_does_string_look_like_datetime(obj)
23-
24-
25-
class ConcatDateCols:
26-
params = ([1234567890, "AAAA"], [1, 2])
27-
param_names = ["value", "dim"]
28-
29-
def setup(self, value, dim):
30-
count_elem = 10000
31-
if dim == 1:
32-
self.object = (np.array([value] * count_elem),)
33-
if dim == 2:
34-
self.object = (
35-
np.array([value] * count_elem),
36-
np.array([value] * count_elem),
37-
)
38-
39-
def time_check_concat(self, value, dim):
40-
concat_date_cols(self.object)

asv_bench/benchmarks/series_methods.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,14 @@ def time_searchsorted(self, dtype):
148148

149149

150150
class Map:
151-
params = (["dict", "Series", "lambda"], ["object", "category", "int"])
152-
param_names = "mapper"
153-
154-
def setup(self, mapper, dtype):
151+
params = (
152+
["dict", "Series", "lambda"],
153+
["object", "category", "int"],
154+
[None, "ignore"],
155+
)
156+
param_names = ["mapper", "dtype", "na_action"]
157+
158+
def setup(self, mapper, dtype, na_action):
155159
map_size = 1000
156160
map_data = Series(map_size - np.arange(map_size), dtype=dtype)
157161

@@ -168,8 +172,8 @@ def setup(self, mapper, dtype):
168172

169173
self.s = Series(np.random.randint(0, map_size, 10000), dtype=dtype)
170174

171-
def time_map(self, mapper, *args, **kwargs):
172-
self.s.map(self.map_data)
175+
def time_map(self, mapper, dtype, na_action):
176+
self.s.map(self.map_data, na_action=na_action)
173177

174178

175179
class Clip:

asv_bench/benchmarks/tslibs/fields.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,15 @@ class TimeGetTimedeltaField:
1919
def setup(self, size, field):
2020
arr = np.random.randint(0, 10, size=size, dtype="i8")
2121
self.i8data = arr
22+
arr = np.random.randint(-86400 * 1_000_000_000, 0, size=size, dtype="i8")
23+
self.i8data_negative = arr
2224

2325
def time_get_timedelta_field(self, size, field):
2426
get_timedelta_field(self.i8data, field)
2527

28+
def time_get_timedelta_field_negative_td(self, size, field):
29+
get_timedelta_field(self.i8data_negative, field)
30+
2631

2732
class TimeGetDateField:
2833
params = [
@@ -72,3 +77,6 @@ def setup(self, size, side, period, freqstr, month_kw):
7277

7378
def time_get_start_end_field(self, size, side, period, freqstr, month_kw):
7479
get_start_end_field(self.i8data, self.attrname, freqstr, month_kw=month_kw)
80+
81+
82+
from ..pandas_vb_common import setup # noqa: F401 isort:skip

0 commit comments

Comments
 (0)