Skip to content

Commit 991fd2e

Browse files
committed
Merge branch '2.3.x' of https://github.com/pandas-dev/pandas into 2.3.x
2 parents 4acd264 + 04c3e81 commit 991fd2e

Some content is hidden

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

44 files changed

+468
-452
lines changed

.circleci/config.yml

-143
This file was deleted.

.gitattributes

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ pandas/_version.py export-subst
6161
*.pxi export-ignore
6262

6363
# Ignoring stuff from the top level
64-
.circleci export-ignore
6564
.github export-ignore
6665
asv_bench export-ignore
6766
ci export-ignore

.github/workflows/package-checks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
runs-on: ubuntu-22.04
5454
strategy:
5555
matrix:
56-
python-version: ['3.9', '3.10', '3.11']
56+
python-version: ['3.10', '3.11']
5757
fail-fast: false
5858
name: Test Conda Forge Recipe - Python ${{ matrix.python-version }}
5959
concurrency:

.github/workflows/unit-tests.yml

+23-14
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ defaults:
2222

2323
jobs:
2424
ubuntu:
25-
runs-on: ubuntu-22.04
25+
runs-on: ${{ matrix.platform }}
2626
timeout-minutes: 90
2727
strategy:
2828
matrix:
29-
env_file: [actions-39.yaml, actions-310.yaml, actions-311.yaml, actions-312.yaml]
29+
platform: [ubuntu-22.04, ubuntu-24.04-arm]
30+
env_file: [actions-310.yaml, actions-311.yaml, actions-312.yaml]
3031
# Prevent the include jobs from overriding other jobs
3132
pattern: [""]
3233
pandas_future_infer_string: ["0"]
@@ -35,9 +36,11 @@ jobs:
3536
env_file: actions-311-downstream_compat.yaml
3637
pattern: "not slow and not network and not single_cpu"
3738
pytest_target: "pandas/tests/test_downstream.py"
39+
platform: ubuntu-22.04
3840
- name: "Minimum Versions"
39-
env_file: actions-39-minimum_versions.yaml
41+
env_file: actions-310-minimum_versions.yaml
4042
pattern: "not slow and not network and not single_cpu"
43+
platform: ubuntu-22.04
4144
- name: "Locale: it_IT"
4245
env_file: actions-311.yaml
4346
pattern: "not slow and not network and not single_cpu"
@@ -48,6 +51,7 @@ jobs:
4851
# Also install it_IT (its encoding is ISO8859-1) but do not activate it.
4952
# It will be temporarily activated during tests with locale.setlocale
5053
extra_loc: "it_IT"
54+
platform: ubuntu-22.04
5155
- name: "Locale: zh_CN"
5256
env_file: actions-311.yaml
5357
pattern: "not slow and not network and not single_cpu"
@@ -58,55 +62,60 @@ jobs:
5862
# Also install zh_CN (its encoding is gb2312) but do not activate it.
5963
# It will be temporarily activated during tests with locale.setlocale
6064
extra_loc: "zh_CN"
61-
- name: "Copy-on-Write 3.9"
62-
env_file: actions-39.yaml
63-
pattern: "not slow and not network and not single_cpu"
64-
pandas_copy_on_write: "1"
65+
platform: ubuntu-22.04
6566
- name: "Copy-on-Write 3.10"
6667
env_file: actions-310.yaml
6768
pattern: "not slow and not network and not single_cpu"
6869
pandas_copy_on_write: "1"
70+
platform: ubuntu-22.04
6971
- name: "Copy-on-Write 3.11"
7072
env_file: actions-311.yaml
7173
pattern: "not slow and not network and not single_cpu"
7274
pandas_copy_on_write: "1"
75+
platform: ubuntu-22.04
7376
- name: "Copy-on-Write 3.12"
7477
env_file: actions-312.yaml
7578
pattern: "not slow and not network and not single_cpu"
7679
pandas_copy_on_write: "1"
80+
platform: ubuntu-22.04
7781
- name: "Copy-on-Write 3.11 (warnings)"
7882
env_file: actions-311.yaml
7983
pattern: "not slow and not network and not single_cpu"
8084
pandas_copy_on_write: "warn"
85+
platform: ubuntu-22.04
8186
- name: "Copy-on-Write 3.10 (warnings)"
8287
env_file: actions-310.yaml
8388
pattern: "not slow and not network and not single_cpu"
8489
pandas_copy_on_write: "warn"
85-
- name: "Copy-on-Write 3.9 (warnings)"
86-
env_file: actions-39.yaml
87-
pattern: "not slow and not network and not single_cpu"
88-
pandas_copy_on_write: "warn"
90+
platform: ubuntu-22.04
8991
- name: "Future infer strings"
9092
env_file: actions-312.yaml
9193
pandas_future_infer_string: "1"
9294
pandas_copy_on_write: "1"
95+
platform: ubuntu-22.04
9396
- name: "Future infer strings (without pyarrow)"
9497
env_file: actions-311.yaml
9598
pandas_future_infer_string: "1"
9699
pandas_copy_on_write: "1"
100+
platform: ubuntu-22.04
97101
- name: "Pypy"
98102
env_file: actions-pypy-39.yaml
99103
pattern: "not slow and not network and not single_cpu"
100104
test_args: "--max-worker-restart 0"
105+
platform: ubuntu-22.04
101106
- name: "Numpy Dev"
102107
env_file: actions-311-numpydev.yaml
103108
pattern: "not slow and not network and not single_cpu"
104109
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
110+
platform: ubuntu-22.04
105111
- name: "Pyarrow Nightly"
106112
env_file: actions-311-pyarrownightly.yaml
107113
pattern: "not slow and not network and not single_cpu"
114+
pandas_future_infer_string: "1"
115+
pandas_copy_on_write: "1"
116+
platform: ubuntu-22.04
108117
fail-fast: false
109-
name: ${{ matrix.name || format('ubuntu-latest {0}', matrix.env_file) }}
118+
name: ${{ matrix.name || format('ubuntu-latest {0}', matrix.env_file) }}-${{ matrix.platform }}
110119
env:
111120
PATTERN: ${{ matrix.pattern }}
112121
LANG: ${{ matrix.lang || 'C.UTF-8' }}
@@ -122,7 +131,7 @@ jobs:
122131
REMOVE_PYARROW: ${{ matrix.name == 'Future infer strings (without pyarrow)' && '1' || '0' }}
123132
concurrency:
124133
# https://github.community/t/concurrecy-not-work-for-push/183068/7
125-
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}-${{ matrix.pandas_copy_on_write || '' }}-${{ matrix.pandas_future_infer_string }}
134+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}-${{ matrix.pandas_copy_on_write || '' }}-${{ matrix.pandas_future_infer_string }}-${{ matrix.platform }}
126135
cancel-in-progress: true
127136

128137
services:
@@ -209,7 +218,7 @@ jobs:
209218
matrix:
210219
# Note: Don't use macOS latest since macos 14 appears to be arm64 only
211220
os: [macos-13, macos-14, windows-latest]
212-
env_file: [actions-39.yaml, actions-310.yaml, actions-311.yaml, actions-312.yaml]
221+
env_file: [actions-310.yaml, actions-311.yaml, actions-312.yaml]
213222
fail-fast: false
214223
runs-on: ${{ matrix.os }}
215224
name: ${{ format('{0} {1}', matrix.os, matrix.env_file) }}

.github/workflows/wheels.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,13 @@ jobs:
9494
buildplat:
9595
- [ubuntu-22.04, manylinux_x86_64]
9696
- [ubuntu-22.04, musllinux_x86_64]
97+
- [ubuntu-24.04-arm, manylinux_aarch64]
9798
- [macos-13, macosx_x86_64]
9899
# Note: M1 images on Github Actions start from macOS 14
99100
- [macos-14, macosx_arm64]
100101
- [windows-2022, win_amd64]
101102
# TODO: support PyPy?
102-
python: [["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"], ["cp313", "3.13"], ["cp313t", "3.13"]]
103+
python: [["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"], ["cp313", "3.13"], ["cp313t", "3.13"]]
103104
include:
104105
# TODO: Remove this plus installing build deps in cibw_before_build.sh
105106
# after pandas can be built with a released NumPy/Cython

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: pandas-dev
44
channels:
55
- conda-forge
66
dependencies:
7-
- python=3.9
7+
- python=3.10
88

99
# build dependencies
1010
- versioneer

ci/deps/actions-311-pyarrownightly.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies:
2525

2626
- pip:
2727
- "tzdata>=2022.7"
28-
- "--extra-index-url https://pypi.fury.io/arrow-nightlies/"
28+
- "--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
2929
- "--prefer-binary"
3030
- "--pre"
3131
- "pyarrow"

ci/deps/actions-39.yaml

-64
This file was deleted.

0 commit comments

Comments
 (0)