Skip to content

Commit 3069283

Browse files
authored
Merge branch 'main' into bug1
2 parents 5b09b0c + eacf032 commit 3069283

File tree

88 files changed

+883
-445
lines changed

Some content is hidden

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

88 files changed

+883
-445
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/[email protected].0
159+
uses: pypa/[email protected].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: 3 additions & 3 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.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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,10 @@ 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_iterator PR07,SA01" \
8988
-i "pandas.api.types.is_re_compilable PR07,SA01" \
9089
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
9190
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
9291
-i "pandas.arrays.IntegerArray SA01" \
93-
-i "pandas.arrays.IntervalArray.left SA01" \
9492
-i "pandas.arrays.IntervalArray.length SA01" \
9593
-i "pandas.arrays.IntervalArray.right SA01" \
9694
-i "pandas.arrays.NumpyExtensionArray SA01" \
@@ -144,7 +142,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
144142
-i "pandas.io.stata.StataWriter.write_file SA01" \
145143
-i "pandas.plotting.andrews_curves RT03,SA01" \
146144
-i "pandas.plotting.scatter_matrix PR07,SA01" \
147-
-i "pandas.set_eng_float_format RT03,SA01" \
148145
-i "pandas.tseries.offsets.BDay PR02,SA01" \
149146
-i "pandas.tseries.offsets.BQuarterBegin.is_on_offset GL08" \
150147
-i "pandas.tseries.offsets.BQuarterBegin.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: 2 additions & 2 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

ci/deps/actions-311-downstream_compat.yaml

Lines changed: 2 additions & 2 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

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)