Skip to content

Commit 5289a82

Browse files
jorisvandenbosschejorisvandenbossche
committed
Merge remote-tracking branch 'upstream/main' into array-copy
2 parents d70405e + cbf6e42 commit 5289a82

File tree

95 files changed

+922
-545
lines changed

Some content is hidden

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

95 files changed

+922
-545
lines changed

‎.github/actions/build_pandas/action.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ runs:
2222
fi
2323
shell: bash -el {0}
2424

25-
- name: Uninstall nomkl
26-
run: |
27-
if conda list nomkl | grep nomkl 1>/dev/null; then
28-
conda remove nomkl -y
29-
fi
30-
shell: bash -el {0}
31-
3225
- name: Build Pandas
3326
run: |
3427
if [[ ${{ inputs.editable }} == "true" ]]; then

‎.github/actions/setup-conda/action.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ runs:
99
- name: Install ${{ inputs.environment-file }}
1010
uses: mamba-org/setup-micromamba@v1
1111
with:
12-
# Pinning to avoid 2.0 failures
13-
micromamba-version: '1.5.10-0'
1412
environment-file: ${{ inputs.environment-file }}
1513
environment-name: test
1614
condarc-file: ci/.condarc

‎.github/workflows/unit-tests.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ jobs:
8686
TEST_ARGS: ${{ matrix.test_args || '' }}
8787
PYTEST_WORKERS: 'auto'
8888
PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }}
89-
NPY_PROMOTION_STATE: ${{ matrix.env_file == 'actions-311-numpydev.yaml' && 'weak' || 'legacy' }}
9089
# Clipboard tests
9190
QT_QPA_PLATFORM: offscreen
9291
REMOVE_PYARROW: ${{ matrix.name == 'Future infer strings (without pyarrow)' && '1' || '0' }}

‎.github/workflows/wheels.yml‎

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

158158
- name: Build wheels
159-
uses: pypa/cibuildwheel@v2.21.0
159+
uses: pypa/cibuildwheel@v2.21.3
160160
with:
161161
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
162162
env:

‎.pre-commit-config.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ minimum_pre_commit_version: 2.15.0
22
exclude: ^LICENSES/|\.(html|csv|svg)$
33
# reserve "manual" for relatively slow hooks which we still want to run in CI
44
default_stages: [
5-
commit,
6-
merge-commit,
7-
push,
5+
pre-commit,
6+
pre-merge-commit,
7+
pre-push,
88
prepare-commit-msg,
99
commit-msg,
1010
post-checkout,
@@ -19,7 +19,7 @@ ci:
1919
skip: [pyright, mypy]
2020
repos:
2121
- repo: https://github.com/astral-sh/ruff-pre-commit
22-
rev: v0.6.9
22+
rev: v0.7.2
2323
hooks:
2424
- id: ruff
2525
args: [--exit-non-zero-on-fix]
@@ -74,7 +74,7 @@ repos:
7474
hooks:
7575
- id: isort
7676
- repo: https://github.com/asottile/pyupgrade
77-
rev: v3.17.0
77+
rev: v3.19.0
7878
hooks:
7979
- id: pyupgrade
8080
args: [--py310-plus]
@@ -95,7 +95,7 @@ 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: v19.1.1
98+
rev: v19.1.3
9999
hooks:
100100
- id: clang-format
101101
files: ^pandas/_libs/src|^pandas/_libs/include

‎ci/code_checks.sh‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -85,55 +85,44 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
8585
-i "pandas.Timestamp.resolution PR02" \
8686
-i "pandas.Timestamp.tzinfo GL08" \
8787
-i "pandas.Timestamp.year GL08" \
88-
-i "pandas.api.types.is_integer PR01,SA01" \
89-
-i "pandas.api.types.is_iterator PR07,SA01" \
9088
-i "pandas.api.types.is_re_compilable PR07,SA01" \
9189
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
9290
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
9391
-i "pandas.arrays.IntegerArray SA01" \
94-
-i "pandas.arrays.IntervalArray.left SA01" \
9592
-i "pandas.arrays.IntervalArray.length SA01" \
9693
-i "pandas.arrays.IntervalArray.right SA01" \
9794
-i "pandas.arrays.NumpyExtensionArray SA01" \
9895
-i "pandas.arrays.SparseArray PR07,SA01" \
9996
-i "pandas.arrays.TimedeltaArray PR07,SA01" \
100-
-i "pandas.core.groupby.DataFrameGroupBy.__iter__ RT03,SA01" \
10197
-i "pandas.core.groupby.DataFrameGroupBy.boxplot PR07,RT03,SA01" \
10298
-i "pandas.core.groupby.DataFrameGroupBy.get_group RT03,SA01" \
10399
-i "pandas.core.groupby.DataFrameGroupBy.groups SA01" \
104100
-i "pandas.core.groupby.DataFrameGroupBy.indices SA01" \
105101
-i "pandas.core.groupby.DataFrameGroupBy.nth PR02" \
106102
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
107-
-i "pandas.core.groupby.DataFrameGroupBy.ohlc SA01" \
108103
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
109104
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
110-
-i "pandas.core.groupby.SeriesGroupBy.__iter__ RT03,SA01" \
111105
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
112106
-i "pandas.core.groupby.SeriesGroupBy.groups SA01" \
113107
-i "pandas.core.groupby.SeriesGroupBy.indices SA01" \
114108
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_decreasing SA01" \
115109
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_increasing SA01" \
116110
-i "pandas.core.groupby.SeriesGroupBy.nth PR02" \
117-
-i "pandas.core.groupby.SeriesGroupBy.ohlc SA01" \
118111
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
119112
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
120-
-i "pandas.core.resample.Resampler.__iter__ RT03,SA01" \
121113
-i "pandas.core.resample.Resampler.get_group RT03,SA01" \
122114
-i "pandas.core.resample.Resampler.groups SA01" \
123115
-i "pandas.core.resample.Resampler.indices SA01" \
124116
-i "pandas.core.resample.Resampler.max PR01,RT03,SA01" \
125117
-i "pandas.core.resample.Resampler.mean SA01" \
126118
-i "pandas.core.resample.Resampler.min PR01,RT03,SA01" \
127-
-i "pandas.core.resample.Resampler.ohlc SA01" \
128119
-i "pandas.core.resample.Resampler.prod SA01" \
129120
-i "pandas.core.resample.Resampler.quantile PR01,PR07" \
130121
-i "pandas.core.resample.Resampler.sem SA01" \
131122
-i "pandas.core.resample.Resampler.std SA01" \
132-
-i "pandas.core.resample.Resampler.sum SA01" \
133123
-i "pandas.core.resample.Resampler.transform PR01,RT03,SA01" \
134124
-i "pandas.core.resample.Resampler.var SA01" \
135125
-i "pandas.errors.AttributeConflictWarning SA01" \
136-
-i "pandas.errors.CSSWarning SA01" \
137126
-i "pandas.errors.ChainedAssignmentError SA01" \
138127
-i "pandas.errors.DataError SA01" \
139128
-i "pandas.errors.DuplicateLabelError SA01" \
@@ -142,22 +131,17 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
142131
-i "pandas.errors.NullFrequencyError SA01" \
143132
-i "pandas.errors.NumExprClobberingError SA01" \
144133
-i "pandas.errors.NumbaUtilError SA01" \
145-
-i "pandas.errors.OptionError SA01" \
146134
-i "pandas.errors.OutOfBoundsTimedelta SA01" \
147135
-i "pandas.errors.PerformanceWarning SA01" \
148136
-i "pandas.errors.PossibleDataLossError SA01" \
149-
-i "pandas.errors.PossiblePrecisionLoss SA01" \
150137
-i "pandas.errors.UndefinedVariableError PR01,SA01" \
151138
-i "pandas.errors.UnsortedIndexError SA01" \
152-
-i "pandas.errors.UnsupportedFunctionCall SA01" \
153139
-i "pandas.errors.ValueLabelTypeMismatch SA01" \
154140
-i "pandas.infer_freq SA01" \
155141
-i "pandas.io.json.build_table_schema PR07,RT03,SA01" \
156142
-i "pandas.io.stata.StataWriter.write_file SA01" \
157-
-i "pandas.json_normalize RT03,SA01" \
158143
-i "pandas.plotting.andrews_curves RT03,SA01" \
159144
-i "pandas.plotting.scatter_matrix PR07,SA01" \
160-
-i "pandas.set_eng_float_format RT03,SA01" \
161145
-i "pandas.tseries.offsets.BDay PR02,SA01" \
162146
-i "pandas.tseries.offsets.BQuarterBegin.is_on_offset GL08" \
163147
-i "pandas.tseries.offsets.BQuarterBegin.n GL08" \
@@ -303,7 +287,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
303287
-i "pandas.tseries.offsets.Second.is_on_offset GL08" \
304288
-i "pandas.tseries.offsets.Second.n GL08" \
305289
-i "pandas.tseries.offsets.Second.normalize GL08" \
306-
-i "pandas.tseries.offsets.SemiMonthBegin SA01" \
307290
-i "pandas.tseries.offsets.SemiMonthBegin.day_of_month GL08" \
308291
-i "pandas.tseries.offsets.SemiMonthBegin.is_on_offset GL08" \
309292
-i "pandas.tseries.offsets.SemiMonthBegin.n GL08" \

‎ci/deps/actions-310-minimum_versions.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ dependencies:
77
- python=3.10
88

99
# build dependencies
10-
- versioneer[toml]
10+
- versioneer
1111
- cython>=0.29.33
12-
- meson[ninja]=1.2.1
12+
- meson=1.2.1
1313
- meson-python=0.13.1
1414

1515
# test dependencies

‎ci/deps/actions-310.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ dependencies:
55
- python=3.10
66

77
# build dependencies
8-
- versioneer[toml]
8+
- versioneer
99
- cython>=0.29.33
10-
- meson[ninja]=1.2.1
10+
- meson=1.2.1
1111
- meson-python=0.13.1
1212

1313
# test dependencies
@@ -52,7 +52,7 @@ dependencies:
5252
- scipy>=1.10.0
5353
- sqlalchemy>=2.0.0
5454
- tabulate>=0.9.0
55-
- xarray>=2022.12.0
55+
- xarray>=2022.12.0, <=2024.9.0
5656
- xlrd>=2.0.1
5757
- xlsxwriter>=3.0.5
5858
- zstandard>=0.19.0

‎ci/deps/actions-311-downstream_compat.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ dependencies:
66
- python=3.11
77

88
# build dependencies
9-
- versioneer[toml]
9+
- versioneer
1010
- cython>=0.29.33
11-
- meson[ninja]=1.2.1
11+
- meson=1.2.1
1212
- meson-python=0.13.1
1313

1414
# test dependencies
@@ -53,7 +53,7 @@ dependencies:
5353
- scipy>=1.10.0
5454
- sqlalchemy>=2.0.0
5555
- tabulate>=0.9.0
56-
- xarray>=2022.12.0
56+
- xarray>=2022.12.0, <=2024.9.0
5757
- xlrd>=2.0.1
5858
- xlsxwriter>=3.0.5
5959
- zstandard>=0.19.0

‎ci/deps/actions-311-numpydev.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ dependencies:
55
- python=3.11
66

77
# build dependencies
8-
- versioneer[toml]
9-
- meson[ninja]=1.2.1
8+
- versioneer
9+
- meson=1.2.1
1010
- meson-python=0.13.1
1111
- cython>=0.29.33
1212

0 commit comments

Comments
 (0)