Skip to content

Commit de4d79a

Browse files
committed
Merge branch 'main' of https://github.com/pandas-dev/pandas into doc_remove_backport_note
2 parents 4294973 + 2498bd1 commit de4d79a

File tree

259 files changed

+6373
-3207
lines changed

Some content is hidden

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

259 files changed

+6373
-3207
lines changed

.devcontainer.json

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

.gitattributes

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,12 @@ pandas/_version.py export-subst
6565
asv_bench export-ignore
6666
ci export-ignore
6767
doc export-ignore
68-
gitpod export-ignore
6968
MANIFEST.in export-ignore
7069
scripts/** export-ignore
7170
typings export-ignore
7271
web export-ignore
7372
CITATION.cff export-ignore
7473
codecov.yml export-ignore
75-
Dockerfile export-ignore
7674
environment.yml export-ignore
7775
setup.py export-ignore
7876

.github/workflows/code-checks.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -131,33 +131,6 @@ jobs:
131131
asv machine --yes
132132
asv run --quick --dry-run --durations=30 --python=same --show-stderr
133133
134-
build_docker_dev_environment:
135-
name: Build Docker Dev Environment
136-
runs-on: ubuntu-24.04
137-
defaults:
138-
run:
139-
shell: bash -el {0}
140-
141-
concurrency:
142-
# https://github.community/t/concurrecy-not-work-for-push/183068/7
143-
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-build_docker_dev_environment
144-
cancel-in-progress: true
145-
146-
steps:
147-
- name: Clean up dangling images
148-
run: docker image prune -f
149-
150-
- name: Checkout
151-
uses: actions/checkout@v5
152-
with:
153-
fetch-depth: 0
154-
155-
- name: Build image
156-
run: docker build --pull --no-cache --tag pandas-dev-env .
157-
158-
- name: Show environment
159-
run: docker run --rm pandas-dev-env python -c "import pandas as pd; print(pd.show_versions())"
160-
161134
requirements-dev-text-installable:
162135
name: Test install requirements-dev.txt
163136
runs-on: ubuntu-24.04

.github/workflows/docbuild-and-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
run: mv doc/build/html web/build/docs
9494

9595
- name: Save website as an artifact
96-
uses: actions/upload-artifact@v4
96+
uses: actions/upload-artifact@v5
9797
with:
9898
name: website
9999
path: web/build

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,7 @@ jobs:
320320
strategy:
321321
fail-fast: false
322322
matrix:
323-
# Separate out macOS 13 and 14, since macOS 14 is arm64 only
324-
os: [ubuntu-24.04, macOS-13, macOS-14, windows-2025]
323+
os: [ubuntu-24.04, macos-15-intel, macos-15, windows-2025]
325324

326325
timeout-minutes: 90
327326

.github/workflows/wheels.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
if: >-
4040
(github.event_name == 'schedule') ||
4141
github.event_name == 'workflow_dispatch' ||
42+
github.event_name == 'release' ||
4243
(github.event_name == 'pull_request' &&
4344
contains(github.event.pull_request.labels.*.name, 'Build')) ||
4445
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && ( ! endsWith(github.ref, 'dev0')))
@@ -64,7 +65,7 @@ jobs:
6465
python -m pip install build
6566
python -m build --sdist
6667
67-
- uses: actions/upload-artifact@v4
68+
- uses: actions/upload-artifact@v5
6869
with:
6970
name: sdist
7071
path: ./dist/*
@@ -84,6 +85,7 @@ jobs:
8485
if: >-
8586
(github.event_name == 'schedule') ||
8687
github.event_name == 'workflow_dispatch' ||
88+
github.event_name == 'release' ||
8789
(github.event_name == 'pull_request' &&
8890
contains(github.event.pull_request.labels.*.name, 'Build')) ||
8991
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && ( ! endsWith(github.ref, 'dev0')))
@@ -138,7 +140,7 @@ jobs:
138140
# removes unnecessary files from the release
139141
- name: Download sdist (not macOS)
140142
#if: ${{ matrix.buildplat[1] != 'macosx_*' }}
141-
uses: actions/download-artifact@v5
143+
uses: actions/download-artifact@v6
142144
with:
143145
name: sdist
144146
path: ./dist
@@ -196,7 +198,7 @@ jobs:
196198
shell: bash -el {0}
197199
run: for whl in $(ls wheelhouse); do wheel unpack wheelhouse/$whl -d /tmp; done
198200

199-
- uses: actions/upload-artifact@v4
201+
- uses: actions/upload-artifact@v5
200202
with:
201203
name: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
202204
path: ./wheelhouse/*.whl
@@ -238,11 +240,11 @@ jobs:
238240

239241
steps:
240242
- name: Download all artefacts
241-
uses: actions/download-artifact@v5
243+
uses: actions/download-artifact@v6
242244
with:
243245
path: dist # everything lands in ./dist/**
244246

245-
# TODO: This step can be probably be achieved by actions/download-artifact@v5
247+
# TODO: This step can be probably be achieved by actions/download-artifact@v6
246248
# by specifying merge-multiple: true, and a glob pattern
247249
- name: Collect files
248250
run: |

.gitpod.yml

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

.pre-commit-config.yaml

Lines changed: 5 additions & 5 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.13.3
22+
rev: v0.14.3
2323
hooks:
2424
- id: ruff
2525
args: [--exit-non-zero-on-fix]
@@ -46,7 +46,7 @@ repos:
4646
- id: codespell
4747
types_or: [python, rst, markdown, cython, c]
4848
- repo: https://github.com/MarcoGorelli/cython-lint
49-
rev: v0.17.0
49+
rev: v0.18.1
5050
hooks:
5151
- id: cython-lint
5252
- id: double-quote-cython-strings
@@ -67,11 +67,11 @@ repos:
6767
- id: trailing-whitespace
6868
args: [--markdown-linebreak-ext=md]
6969
- repo: https://github.com/PyCQA/isort
70-
rev: 6.1.0
70+
rev: 7.0.0
7171
hooks:
7272
- id: isort
7373
- repo: https://github.com/asottile/pyupgrade
74-
rev: v3.20.0
74+
rev: v3.21.0
7575
hooks:
7676
- id: pyupgrade
7777
args: [--py311-plus]
@@ -87,7 +87,7 @@ repos:
8787
types: [text] # overwrite types: [rst]
8888
types_or: [python, rst]
8989
- repo: https://github.com/sphinx-contrib/sphinx-lint
90-
rev: v1.0.0
90+
rev: v1.0.1
9191
hooks:
9292
- id: sphinx-lint
9393
args: ["--enable", "all", "--disable", "line-too-long"]

Dockerfile

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ If you are simply looking to start working with the pandas codebase, navigate to
179179

180180
You can also triage issues which may include reproducing bug reports, or asking for vital information such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to pandas on CodeTriage](https://www.codetriage.com/pandas-dev/pandas).
181181

182-
Or maybe through using pandas you have an idea of your own or are looking for something in the documentation and thinking ‘this can be improved’...you can do something about it!
182+
Or maybe through using pandas you have an idea of your own or are looking for something in the documentation and thinking ‘this can be improved’... you can do something about it!
183183

184184
Feel free to ask questions on the [mailing list](https://groups.google.com/forum/?fromgroups#!forum/pydata) or on [Slack](https://pandas.pydata.org/docs/dev/development/community.html?highlight=slack#community-slack).
185185

0 commit comments

Comments
 (0)