Skip to content

Commit f8b5831

Browse files
Merge branch 'main' into add-emscripten-ci
2 parents feaac77 + cbe968f commit f8b5831

File tree

419 files changed

+4512
-5569
lines changed

Some content is hidden

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

419 files changed

+4512
-5569
lines changed

.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
jobs:
44
test-arm:
55
machine:
6-
image: ubuntu-2004:2022.04.1
6+
image: default
77
resource_class: arm.large
88
environment:
99
ENV_FILE: ci/deps/circle-310-arm64.yaml
@@ -46,7 +46,7 @@ jobs:
4646
cibw-build:
4747
type: string
4848
machine:
49-
image: ubuntu-2004:2022.04.1
49+
image: default
5050
resource_class: arm.large
5151
environment:
5252
TRIGGER_SOURCE: << pipeline.trigger_source >>

.github/workflows/wheels.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141

142142
- name: Build normal wheels
143143
if: ${{ (env.IS_SCHEDULE_DISPATCH != 'true' || env.IS_PUSH == 'true') }}
144-
uses: pypa/cibuildwheel@v2.16.5
144+
uses: pypa/cibuildwheel@v2.17.0
145145
with:
146146
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
147147
env:
@@ -150,7 +150,7 @@ jobs:
150150

151151
- name: Build nightly wheels (with NumPy pre-release)
152152
if: ${{ (env.IS_SCHEDULE_DISPATCH == 'true' && env.IS_PUSH != 'true') }}
153-
uses: pypa/cibuildwheel@v2.16.5
153+
uses: pypa/cibuildwheel@v2.17.0
154154
with:
155155
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
156156
env:

.pre-commit-config.yaml

+7-8
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ci:
1919
skip: [pylint, pyright, mypy]
2020
repos:
2121
- repo: https://github.com/astral-sh/ruff-pre-commit
22-
rev: v0.1.13
22+
rev: v0.3.1
2323
hooks:
2424
- id: ruff
2525
args: [--exit-non-zero-on-fix]
@@ -30,6 +30,12 @@ repos:
3030
files: ^pandas
3131
exclude: ^pandas/tests
3232
args: [--select, "ANN001,ANN2", --fix-only, --exit-non-zero-on-fix]
33+
- id: ruff
34+
name: ruff-use-pd_array-in-core
35+
alias: ruff-use-pd_array-in-core
36+
files: ^pandas/core/
37+
exclude: ^pandas/core/api\.py$
38+
args: [--select, "ICN001", --exit-non-zero-on-fix]
3339
- id: ruff-format
3440
exclude: ^scripts
3541
- repo: https://github.com/jendrikseipp/vulture
@@ -272,13 +278,6 @@ repos:
272278
language: python
273279
entry: python scripts/validate_unwanted_patterns.py --validation-type="nodefault_used_not_only_for_typing"
274280
types: [python]
275-
- id: use-pd_array-in-core
276-
name: Import pandas.array as pd_array in core
277-
language: python
278-
entry: python scripts/use_pd_array_in_core.py
279-
files: ^pandas/core/
280-
exclude: ^pandas/core/api\.py$
281-
types: [python]
282281
- id: no-return-exception
283282
name: Use raise instead of return for exceptions
284283
language: pygrep

asv_bench/benchmarks/indexing.py

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
lower-level methods directly on Index and subclasses, see index_object.py,
44
indexing_engine.py, and index_cached.py
55
"""
6+
67
from datetime import datetime
78
import warnings
89

asv_bench/benchmarks/libs.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
If a PR does not edit anything in _libs/, then it is unlikely that the
66
benchmarks will be affected.
77
"""
8+
89
import numpy as np
910

1011
from pandas._libs.lib import (

asv_bench/benchmarks/package.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
Benchmarks for pandas at the package-level.
33
"""
4+
45
import subprocess
56
import sys
67

asv_bench/benchmarks/period.py

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Period benchmarks with non-tslibs dependencies. See
33
benchmarks.tslibs.period for benchmarks that rely only on tslibs.
44
"""
5+
56
from pandas import (
67
DataFrame,
78
Period,

asv_bench/benchmarks/stat_ops.py

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def setup(self, op, axis):
3333
("median", 1),
3434
("median", None),
3535
("std", 1),
36+
("std", None),
3637
)
3738
):
3839
# Skipping cases where datetime aggregations are not implemented

asv_bench/benchmarks/tslibs/offsets.py

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
offsets benchmarks that rely only on tslibs. See benchmarks.offset for
33
offsets benchmarks that rely on other parts of pandas.
44
"""
5+
56
from datetime import datetime
67

78
import numpy as np

asv_bench/benchmarks/tslibs/resolution.py

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
df.loc[key] = (val.average, val.stdev)
1818
1919
"""
20+
2021
import numpy as np
2122

2223
try:

asv_bench/benchmarks/tslibs/timedelta.py

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Timedelta benchmarks that rely only on tslibs. See benchmarks.timedeltas for
33
Timedelta benchmarks that rely on other parts of pandas.
44
"""
5+
56
import datetime
67

78
import numpy as np

asv_bench/benchmarks/tslibs/tslib.py

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
val = %timeit -o tr.time_ints_to_pydatetime(box, size, tz)
1616
df.loc[key] = (val.average, val.stdev)
1717
"""
18+
1819
from datetime import (
1920
timedelta,
2021
timezone,

0 commit comments

Comments
 (0)