Skip to content

Commit 590cd2f

Browse files
authored
Merge branch 'pandas-dev:main' into sty-b905
2 parents 166e8f0 + f4851e5 commit 590cd2f

File tree

205 files changed

+3148
-2321
lines changed

Some content is hidden

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

205 files changed

+3148
-2321
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/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: 2 additions & 0 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')))
@@ -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')))

.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.

doc/source/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,6 @@ def setup(app) -> None:
828828
"https://github.com/pandas-dev/pandas/blob/v0.20.2/pandas/core/generic.py#L568",
829829
"https://github.com/pandas-dev/pandas/blob/v0.20.2/pandas/core/frame.py#L1495",
830830
"https://github.com/pandas-dev/pandas/issues/174151",
831-
"https://gitpod.io/#https://github.com/USERNAME/pandas",
832831
"https://manishamde.github.io/blog/2013/03/07/pandas-and-python-top-10/",
833832
"https://matplotlib.org/api/axes_api.html#matplotlib.axes.Axes.table",
834833
"https://nipunbatra.github.io/blog/visualisation/2013/05/01/aggregation-timeseries.html",

doc/source/development/contributing_environment.rst

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@ locally before pushing your changes. It's recommended to also install the :ref:`
1616
:maxdepth: 2
1717
:hidden:
1818

19-
contributing_gitpod.rst
2019

2120
Step 1: install a C compiler
2221
----------------------------
2322

24-
How to do this will depend on your platform. If you choose to use ``Docker`` or ``GitPod``
25-
in the next step, then you can skip this step.
23+
How to do this will depend on your platform.
2624

2725
**Windows**
2826

@@ -163,51 +161,6 @@ should already exist.
163161
# Install the build dependencies
164162
python -m pip install -r requirements-dev.txt
165163
166-
Option 3: using Docker
167-
~~~~~~~~~~~~~~~~~~~~~~
168-
169-
pandas provides a ``DockerFile`` in the root directory to build a Docker image
170-
with a full pandas development environment.
171-
172-
**Docker Commands**
173-
174-
Build the Docker image::
175-
176-
# Build the image
177-
docker build -t pandas-dev .
178-
179-
Run Container::
180-
181-
# Run a container and bind your local repo to the container
182-
# This command assumes you are running from your local repo
183-
# but if not alter ${PWD} to match your local repo path
184-
docker run -it --rm -v ${PWD}:/home/pandas pandas-dev
185-
186-
*Even easier, you can integrate Docker with the following IDEs:*
187-
188-
**Visual Studio Code**
189-
190-
You can use the DockerFile to launch a remote session with Visual Studio Code,
191-
a popular free IDE, using the ``.devcontainer.json`` file.
192-
See https://code.visualstudio.com/docs/remote/containers for details.
193-
194-
**PyCharm (Professional)**
195-
196-
Enable Docker support and use the Services tool window to build and manage images as well as
197-
run and interact with containers.
198-
See https://www.jetbrains.com/help/pycharm/docker.html for details.
199-
200-
Option 4: using Gitpod
201-
~~~~~~~~~~~~~~~~~~~~~~
202-
203-
Gitpod is an open-source platform that automatically creates the correct development
204-
environment right in your browser, reducing the need to install local development
205-
environments and deal with incompatible dependencies.
206-
207-
If you are a Windows user, unfamiliar with using the command line or building pandas
208-
for the first time, it is often faster to build with Gitpod. Here are the in-depth instructions
209-
for :ref:`building pandas with GitPod <contributing-gitpod>`.
210-
211164
Step 3: build and install pandas
212165
--------------------------------
213166

0 commit comments

Comments
 (0)