Skip to content

Commit 351b79c

Browse files
Merge branch 'main' into doc_pdep_publishing
2 parents 9b66357 + 6a2da7a commit 351b79c

File tree

1,065 files changed

+35982
-17712
lines changed

Some content is hidden

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

1,065 files changed

+35982
-17712
lines changed

.circleci/config.yml

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

.circleci/setup_env.sh

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

.devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// Use 'settings' to set *default* container specific settings.json values on container create.
99
// You can edit these settings after create using File > Preferences > Settings > Remote.
1010
"settings": {
11-
"terminal.integrated.shell.linux": "/bin/bash",
1211
"python.pythonPath": "/usr/local/bin/python",
1312
"python.formatting.provider": "black",
1413
"python.linting.enabled": true,

.gitattributes

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,13 @@ 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
6867
doc export-ignore
6968
gitpod export-ignore
7069
MANIFEST.in export-ignore
71-
scripts export-ignore
70+
scripts/** export-ignore
7271
typings export-ignore
7372
web export-ignore
7473
CITATION.cff export-ignore
@@ -82,3 +81,6 @@ setup.py export-ignore
8281
# csv_dir_path fixture checks the existence of the directory
8382
# exclude the whole directory to avoid running related tests in sdist
8483
pandas/tests/io/parser/data export-ignore
84+
85+
# Include cibw script in sdist since it's needed for building wheels
86+
scripts/cibw_before_build.sh -export-ignore

.github/CODEOWNERS

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@
44
# ci
55
ci/ @mroeschke
66

7-
# web
8-
web/ @datapythonista
9-
107
# docs
118
doc/cheatsheet @Dr-Irv
129
doc/source/development @noatamir
1310

1411
# pandas
15-
pandas/_libs/ @WillAyd
16-
pandas/_libs/tslibs/* @MarcoGorelli
1712
pandas/_typing.py @Dr-Irv
1813
pandas/core/groupby/* @rhshadrach
19-
pandas/core/tools/datetimes.py @MarcoGorelli
2014
pandas/io/excel/* @rhshadrach
2115
pandas/io/formats/style.py @attack68
2216
pandas/io/formats/style_render.py @attack68

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ body:
3131
attributes:
3232
label: Feature Description
3333
description: >
34-
Please describe how the new feature would be implemented, using psudocode if relevant.
34+
Please describe how the new feature would be implemented, using pseudocode if relevant.
3535
placeholder: >
3636
Add a new parameter to DataFrame, to_series, to return a Series if possible.
3737

.github/actions/build_pandas/action.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ inputs:
44
editable:
55
description: Whether to build pandas in editable mode (default true)
66
default: true
7-
meson_args:
8-
description: Extra flags to pass to meson
9-
required: false
10-
cflags_adds:
11-
description: Items to append to the CFLAGS variable
12-
required: false
7+
werror:
8+
description: Enable werror flag for build
9+
default: true
1310
runs:
1411
using: composite
1512
steps:
@@ -30,12 +27,11 @@ runs:
3027

3128
- name: Build Pandas
3229
run: |
33-
export CFLAGS="$CFLAGS ${{ inputs.cflags_adds }}"
3430
if [[ ${{ inputs.editable }} == "true" ]]; then
35-
pip install -e . --no-build-isolation -v --no-deps ${{ inputs.meson_args }} \
36-
--config-settings=setup-args="--werror"
31+
pip install -e . --no-build-isolation -v --no-deps \
32+
${{ inputs.werror == 'true' && '-Csetup-args="--werror"' || '' }}
3733
else
38-
pip install . --no-build-isolation -v --no-deps ${{ inputs.meson_args }} \
39-
--config-settings=setup-args="--werror"
34+
pip install . --no-build-isolation -v --no-deps \
35+
${{ inputs.werror == 'true' && '-Csetup-args="--werror"' || '' }}
4036
fi
4137
shell: bash -el {0}

.github/actions/run-tests/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ runs:
77
shell: bash -el {0}
88

99
- name: Publish test results
10-
uses: actions/upload-artifact@v3
10+
uses: actions/upload-artifact@v4
1111
with:
1212
name: Test results
1313
path: test-data.xml
1414
if: failure()
1515

1616
- name: Upload coverage to Codecov
17-
uses: codecov/codecov-action@v3
17+
uses: codecov/codecov-action@v5
1818
with:
1919
flags: unittests
2020
name: codecov-pandas

.github/actions/setup-conda/action.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@ runs:
77
using: composite
88
steps:
99
- name: Install ${{ inputs.environment-file }}
10-
uses: mamba-org/setup-micromamba@v1
10+
uses: mamba-org/setup-micromamba@v2
1111
with:
1212
environment-file: ${{ inputs.environment-file }}
1313
environment-name: test
1414
condarc-file: ci/.condarc
1515
cache-environment: true
1616
cache-downloads: true
17+
18+
- name: Uninstall pyarrow
19+
if: ${{ env.REMOVE_PYARROW == '1' }}
20+
run: |
21+
micromamba remove -y pyarrow
22+
shell: bash -el {0}

.github/workflows/code-checks.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212

1313
env:
1414
ENV_FILE: environment.yml
@@ -21,7 +21,7 @@ permissions:
2121
jobs:
2222
docstring_typing_manual_hooks:
2323
name: Docstring validation, typing, and other manual pre-commit hooks
24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-24.04
2525
defaults:
2626
run:
2727
shell: bash -el {0}
@@ -51,6 +51,11 @@ jobs:
5151
# TODO: The doctests have to be run first right now, since the Cython doctests only work
5252
# with pandas installed in non-editable mode
5353
# This can be removed once pytest-cython doesn't require C extensions to be installed inplace
54+
55+
- name: Extra installs
56+
# https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html#github-actions-azure-pipelines-travis-ci-and-gitlab-ci-cd
57+
run: sudo apt-get update && sudo apt-get install -y libegl1 libopengl0
58+
5459
- name: Run doctests
5560
run: cd ci && ./code_checks.sh doctests
5661
if: ${{ steps.build.outcome == 'success' && always() }}
@@ -97,7 +102,7 @@ jobs:
97102

98103
asv-benchmarks:
99104
name: ASV Benchmarks
100-
runs-on: ubuntu-22.04
105+
runs-on: ubuntu-24.04
101106
defaults:
102107
run:
103108
shell: bash -el {0}
@@ -128,7 +133,7 @@ jobs:
128133
129134
build_docker_dev_environment:
130135
name: Build Docker Dev Environment
131-
runs-on: ubuntu-22.04
136+
runs-on: ubuntu-24.04
132137
defaults:
133138
run:
134139
shell: bash -el {0}
@@ -155,7 +160,7 @@ jobs:
155160

156161
requirements-dev-text-installable:
157162
name: Test install requirements-dev.txt
158-
runs-on: ubuntu-22.04
163+
runs-on: ubuntu-24.04
159164

160165
concurrency:
161166
# https://github.community/t/concurrecy-not-work-for-push/183068/7

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313

1414
jobs:
1515
analyze:
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
1717
permissions:
1818
actions: read
1919
contents: read

0 commit comments

Comments
 (0)