Skip to content

Commit cc092e3

Browse files
committed
Merge remote-tracking branch 'upstream/main' into BUG-56994/pyarrow-assignment-unexpected-dtypes
2 parents e69265b + a5e812d commit cc092e3

File tree

137 files changed

+499
-551
lines changed

Some content is hidden

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

137 files changed

+499
-551
lines changed

.circleci/config.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,9 @@ workflows:
141141
only: /^v.*/
142142
matrix:
143143
parameters:
144-
cibw-build: ["cp39-manylinux_aarch64",
145-
"cp310-manylinux_aarch64",
144+
cibw-build: ["cp310-manylinux_aarch64",
146145
"cp311-manylinux_aarch64",
147146
"cp312-manylinux_aarch64",
148-
"cp39-musllinux_aarch64",
149147
"cp310-musllinux_aarch64",
150148
"cp311-musllinux_aarch64",
151149
"cp312-musllinux_aarch64",]

.github/workflows/package-checks.yml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
timeout-minutes: 90
2727
strategy:
2828
matrix:
29-
env_file: [actions-39.yaml, actions-310.yaml, actions-311.yaml, actions-312.yaml]
29+
env_file: [actions-310.yaml, actions-311.yaml, actions-312.yaml]
3030
# Prevent the include jobs from overriding other jobs
3131
pattern: [""]
3232
include:
@@ -35,7 +35,7 @@ jobs:
3535
pattern: "not slow and not network and not single_cpu"
3636
pytest_target: "pandas/tests/test_downstream.py"
3737
- name: "Minimum Versions"
38-
env_file: actions-39-minimum_versions.yaml
38+
env_file: actions-310-minimum_versions.yaml
3939
pattern: "not slow and not network and not single_cpu"
4040
- name: "Locale: it_IT"
4141
env_file: actions-311.yaml
@@ -146,6 +146,8 @@ jobs:
146146
- name: Build Pandas
147147
id: build
148148
uses: ./.github/actions/build_pandas
149+
# TODO: Re-enable once Pypy has Pypy 3.10 on conda-forge
150+
if: ${{ matrix.name != 'Pypy' }}
149151
with:
150152
meson_args: ${{ matrix.meson_args }}
151153
cflags_adds: ${{ matrix.cflags_adds }}
@@ -170,7 +172,7 @@ jobs:
170172
matrix:
171173
# Note: Don't use macOS latest since macos 14 appears to be arm64 only
172174
os: [macos-13, macos-14, windows-latest]
173-
env_file: [actions-39.yaml, actions-310.yaml, actions-311.yaml, actions-312.yaml]
175+
env_file: [actions-310.yaml, actions-311.yaml, actions-312.yaml]
174176
fail-fast: false
175177
runs-on: ${{ matrix.os }}
176178
name: ${{ format('{0} {1}', matrix.os, matrix.env_file) }}

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
- [macos-14, macosx_arm64]
100100
- [windows-2022, win_amd64]
101101
# TODO: support PyPy?
102-
python: [["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"]]
102+
python: [["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"]]
103103
env:
104104
IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
105105
IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ repos:
7575
rev: v3.15.2
7676
hooks:
7777
- id: pyupgrade
78-
args: [--py39-plus]
78+
args: [--py310-plus]
7979
- repo: https://github.com/pre-commit/pygrep-hooks
8080
rev: v1.10.0
8181
hooks:

ci/code_checks.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
154154
-i "pandas.Series.dt.tz_convert PR01,PR02" \
155155
-i "pandas.Series.dt.tz_localize PR01,PR02" \
156156
-i "pandas.Series.dt.unit GL08" \
157-
-i "pandas.Series.ge SA01" \
158157
-i "pandas.Series.gt SA01" \
159158
-i "pandas.Series.list.__getitem__ SA01" \
160159
-i "pandas.Series.list.flatten SA01" \
@@ -213,7 +212,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
213212
-i "pandas.Timedelta.asm8 SA01" \
214213
-i "pandas.Timedelta.ceil SA01" \
215214
-i "pandas.Timedelta.components SA01" \
216-
-i "pandas.Timedelta.days SA01" \
217215
-i "pandas.Timedelta.floor SA01" \
218216
-i "pandas.Timedelta.max PR02" \
219217
-i "pandas.Timedelta.min PR02" \

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

Lines changed: 1 addition & 1 deletion
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[toml]

ci/deps/actions-39.yaml

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

doc/source/development/contributing_environment.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Consult the docs for setting up pyenv `here <https://github.com/pyenv/pyenv>`__.
130130
pyenv virtualenv <version> <name-to-give-it>
131131
132132
# For instance:
133-
pyenv virtualenv 3.9.10 pandas-dev
133+
pyenv virtualenv 3.10 pandas-dev
134134
135135
# Activate the virtualenv
136136
pyenv activate pandas-dev

doc/source/getting_started/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Python terminal.
161161
162162
>>> import pandas as pd
163163
>>> pd.test()
164-
running: pytest -m "not slow and not network and not db" /home/user/anaconda3/lib/python3.9/site-packages/pandas
164+
running: pytest -m "not slow and not network and not db" /home/user/anaconda3/lib/python3.10/site-packages/pandas
165165
166166
============================= test session starts ==============================
167167
platform linux -- Python 3.9.7, pytest-6.2.5, py-1.11.0, pluggy-1.0.0

0 commit comments

Comments
 (0)