Skip to content

Commit 8108b43

Browse files
authored
Merge branch 'pandas-dev:main' into pdep_voting_wip
2 parents 4ad9f80 + 97c4ef6 commit 8108b43

File tree

553 files changed

+11565
-5292
lines changed

Some content is hidden

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

553 files changed

+11565
-5292
lines changed

.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
image: ubuntu-2004:2022.04.1
77
resource_class: arm.large
88
environment:
9-
ENV_FILE: ci/deps/circle-39-arm64.yaml
9+
ENV_FILE: ci/deps/circle-310-arm64.yaml
1010
PYTEST_WORKERS: auto
1111
PATTERN: "not single_cpu and not slow and not network and not clipboard and not arm_slow and not db"
1212
PYTEST_TARGET: "pandas"
@@ -26,7 +26,6 @@ jobs:
2626
image: ubuntu-2004:2022.04.1
2727
resource_class: arm.large
2828
environment:
29-
ENV_FILE: ci/deps/circle-38-arm64.yaml
3029
TRIGGER_SOURCE: << pipeline.trigger_source >>
3130
steps:
3231
- checkout

.circleci/setup_env.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ if pip list | grep -q ^pandas; then
5454
pip uninstall -y pandas || true
5555
fi
5656

57-
echo "Build extensions"
58-
python setup.py build_ext -q -j4
59-
6057
echo "Install pandas"
61-
python -m pip install --no-build-isolation --no-use-pep517 -e .
58+
python -m pip install --no-build-isolation -ve .
6259

6360
echo "done"

.github/CODEOWNERS

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# github
2+
.github/ @mroeschke
3+
4+
# ci
5+
ci/ @mroeschke
6+
7+
# web
8+
web/ @datapythonista
9+
10+
# docs
11+
doc/cheatsheet @Dr-Irv
12+
13+
# pandas
14+
pandas/_libs/ @WillAyd
15+
pandas/_libs/tslibs/* @MarcoGorelli
16+
pandas/_typing.py @Dr-Irv
17+
pandas/core/groupby/* @rhshadrach
18+
pandas/core/tools/datetimes.py @MarcoGorelli
19+
pandas/io/excel/* @rhshadrach
20+
pandas/io/formats/style.py @attack68
21+
pandas/io/formats/style_render.py @attack68
22+
pandas/io/formats/templates @attack68

.github/actions/build_pandas/action.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: Build pandas
22
description: Rebuilds the C extensions and installs pandas
3+
inputs:
4+
editable:
5+
description: Whether to build pandas in editable mode (default true)
6+
default: true
37
runs:
48
using: composite
59
steps:
@@ -12,9 +16,9 @@ runs:
1216

1317
- name: Build Pandas
1418
run: |
15-
python setup.py build_ext -j $N_JOBS
16-
python -m pip install -e . --no-build-isolation --no-use-pep517 --no-index
19+
if [[ ${{ inputs.editable }} == "true" ]]; then
20+
pip install -e . --no-build-isolation -v
21+
else
22+
pip install . --no-build-isolation -v
23+
fi
1724
shell: bash -el {0}
18-
env:
19-
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
20-
N_JOBS: ${{ runner.os == 'macOS' && 3 || 2 }}

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,14 @@ inputs:
33
environment-file:
44
description: Conda environment file to use.
55
default: environment.yml
6-
environment-name:
7-
description: Name to use for the Conda environment
8-
default: test
9-
extra-specs:
10-
description: Extra packages to install
11-
required: false
126
runs:
137
using: composite
148
steps:
159
- name: Install ${{ inputs.environment-file }}
16-
uses: mamba-org/provision-with-micromamba@v15
10+
uses: mamba-org/setup-micromamba@v1
1711
with:
1812
environment-file: ${{ inputs.environment-file }}
19-
environment-name: ${{ inputs.environment-name }}
20-
extra-specs: ${{ inputs.extra-specs }}
21-
channels: conda-forge
22-
channel-priority: 'strict'
13+
environment-name: test
2314
condarc-file: ci/condarc.yml
24-
cache-env: true
15+
cache-environment: true
2516
cache-downloads: true

.github/workflows/cache-cleanup.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Clean closed branch caches
2+
on:
3+
pull_request:
4+
types:
5+
- closed
6+
7+
jobs:
8+
cleanup:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Clean Cache
12+
run: |
13+
gh extension install actions/gh-actions-cache
14+
15+
REPO=${{ github.repository }}
16+
BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
17+
18+
echo "Fetching list of cache key"
19+
cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
20+
21+
## Setting this to not fail the workflow while deleting cache keys.
22+
set +e
23+
echo "Deleting caches..."
24+
for cacheKey in $cacheKeysForPR
25+
do
26+
gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
27+
done
28+
echo "Done"
29+
env:
30+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/code-checks.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,24 @@ jobs:
6363
- name: Build Pandas
6464
id: build
6565
uses: ./.github/actions/build_pandas
66+
with:
67+
editable: false
6668

6769
# The following checks are independent of each other and should still be run if one fails
70+
71+
# TODO: The doctests have to be run first right now, since the Cython doctests only work
72+
# with pandas installed in non-editable mode
73+
# This can be removed once pytest-cython doesn't require C extensions to be installed inplace
74+
- name: Run doctests
75+
run: cd ci && ./code_checks.sh doctests
76+
if: ${{ steps.build.outcome == 'success' && always() }}
77+
78+
- name: Install pandas in editable mode
79+
id: build-editable
80+
uses: ./.github/actions/build_pandas
81+
with:
82+
editable: true
83+
6884
- name: Check for no warnings when building single-page docs
6985
run: ci/code_checks.sh single-docs
7086
if: ${{ steps.build.outcome == 'success' && always() }}
@@ -73,10 +89,6 @@ jobs:
7389
run: ci/code_checks.sh code
7490
if: ${{ steps.build.outcome == 'success' && always() }}
7591

76-
- name: Run doctests
77-
run: ci/code_checks.sh doctests
78-
if: ${{ steps.build.outcome == 'success' && always() }}
79-
8092
- name: Run docstring validation
8193
run: ci/code_checks.sh docstrings
8294
if: ${{ steps.build.outcome == 'success' && always() }}

.github/workflows/codeql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
actions: read
1919
contents: read
2020
security-events: write
21+
if: github.repository_owner == 'pandas-dev'
2122

2223
strategy:
2324
fail-fast: false

.github/workflows/package-checks.yml

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ on:
1414
permissions:
1515
contents: read
1616

17+
defaults:
18+
run:
19+
shell: bash -el {0}
20+
1721
jobs:
1822
pip:
1923
if: ${{ github.event.label.name == 'Build' || contains(github.event.pull_request.labels.*.name, 'Build') || github.event_name == 'push'}}
@@ -40,13 +44,38 @@ jobs:
4044
with:
4145
python-version: '3.10'
4246

43-
- name: Install required dependencies
44-
run: |
45-
python -m pip install --upgrade pip setuptools wheel python-dateutil pytz numpy cython
46-
python -m pip install versioneer[toml]
47-
shell: bash -el {0}
48-
4947
- name: Pip install with extra
5048
run: |
51-
python -m pip install -e .[${{ matrix.extra }}] --no-build-isolation
49+
python -m pip install .[${{ matrix.extra }}] -v
5250
shell: bash -el {0}
51+
conda_forge_recipe:
52+
if: ${{ github.event.label.name == 'Build' || contains(github.event.pull_request.labels.*.name, 'Build') || github.event_name == 'push'}}
53+
runs-on: ubuntu-22.04
54+
strategy:
55+
matrix:
56+
python-version: ['3.9', '3.10', '3.11']
57+
fail-fast: false
58+
name: Test Conda Forge Recipe - Python ${{ matrix.python-version }}
59+
concurrency:
60+
# https://i.8713187.xyzmunity/t/concurrecy-not-work-for-push/183068/7
61+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-conda-forge-recipe-${{ matrix.python-version }}
62+
cancel-in-progress: true
63+
steps:
64+
- name: Checkout
65+
uses: actions/checkout@v3
66+
with:
67+
fetch-depth: 0
68+
69+
- name: Set up Python
70+
uses: mamba-org/setup-micromamba@v1
71+
with:
72+
environment-name: recipe-test
73+
create-args: >-
74+
python=${{ matrix.python-version }}
75+
boa
76+
conda-verify
77+
cache-downloads: true
78+
cache-environment: true
79+
80+
- name: Build conda package
81+
run: conda mambabuild ci --no-anaconda-upload --verify --strict-verify --output --output-folder .

.github/workflows/stale-pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
stale:
1212
permissions:
1313
pull-requests: write
14+
if: github.repository_owner == 'pandas-dev'
1415
runs-on: ubuntu-22.04
1516
steps:
1617
- uses: actions/stale@v8

.github/workflows/unit-tests.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ jobs:
3131
pattern: [""]
3232
include:
3333
- name: "Downstream Compat"
34-
env_file: actions-39-downstream_compat.yaml
34+
env_file: actions-311-downstream_compat.yaml
3535
pattern: "not slow and not network and not single_cpu"
3636
pytest_target: "pandas/tests/test_downstream.py"
3737
- name: "Minimum Versions"
3838
env_file: actions-39-minimum_versions.yaml
3939
pattern: "not slow and not network and not single_cpu"
4040
- name: "Locale: it_IT"
41-
env_file: actions-310.yaml
41+
env_file: actions-311.yaml
4242
pattern: "not slow and not network and not single_cpu"
4343
extra_apt: "language-pack-it"
4444
# Use the utf8 version as the default, it has no bad side-effect.
@@ -48,7 +48,7 @@ jobs:
4848
# It will be temporarily activated during tests with locale.setlocale
4949
extra_loc: "it_IT"
5050
- name: "Locale: zh_CN"
51-
env_file: actions-310.yaml
51+
env_file: actions-311.yaml
5252
pattern: "not slow and not network and not single_cpu"
5353
extra_apt: "language-pack-zh-hans"
5454
# Use the utf8 version as the default, it has no bad side-effect.
@@ -58,15 +58,15 @@ jobs:
5858
# It will be temporarily activated during tests with locale.setlocale
5959
extra_loc: "zh_CN"
6060
- name: "Copy-on-Write"
61-
env_file: actions-310.yaml
61+
env_file: actions-311.yaml
6262
pattern: "not slow and not network and not single_cpu"
6363
pandas_copy_on_write: "1"
6464
- name: "Pypy"
6565
env_file: actions-pypy-39.yaml
6666
pattern: "not slow and not network and not single_cpu"
6767
test_args: "--max-worker-restart 0"
6868
- name: "Numpy Dev"
69-
env_file: actions-310-numpydev.yaml
69+
env_file: actions-311-numpydev.yaml
7070
pattern: "not slow and not network and not single_cpu"
7171
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
7272
# TODO(cython3): Re-enable once next-beta(after beta 1) comes out
@@ -229,11 +229,10 @@ jobs:
229229
run: |
230230
/opt/python/cp39-cp39/bin/python -m venv ~/virtualenvs/pandas-dev
231231
. ~/virtualenvs/pandas-dev/bin/activate
232-
python -m pip install --no-cache-dir --no-deps -U pip wheel setuptools
232+
python -m pip install -U pip wheel setuptools meson[ninja]==1.0.1 meson-python==0.13.1
233233
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1
234-
python setup.py build_ext -q -j$(nproc)
235-
python -m pip install --no-cache-dir --no-build-isolation --no-use-pep517 -e .
236-
python -m pip list
234+
python -m pip install --no-cache-dir --no-build-isolation -e .
235+
python -m pip list --no-cache-dir
237236
export PANDAS_CI=1
238237
python -m pytest -m 'not slow and not network and not clipboard and not single_cpu' pandas --junitxml=test-data.xml
239238
concurrency:
@@ -268,10 +267,9 @@ jobs:
268267
run: |
269268
/opt/python/cp39-cp39/bin/python -m venv ~/virtualenvs/pandas-dev
270269
. ~/virtualenvs/pandas-dev/bin/activate
271-
python -m pip install --no-cache-dir --no-deps -U pip wheel setuptools
270+
python -m pip install -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.0.1
272271
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1
273-
python setup.py build_ext -q -j$(nproc)
274-
python -m pip install --no-cache-dir --no-build-isolation --no-use-pep517 -e .
272+
python -m pip install --no-cache-dir --no-build-isolation -e .
275273
python -m pip list --no-cache-dir
276274
277275
- name: Run Tests
@@ -339,16 +337,15 @@ jobs:
339337
run: |
340338
python --version
341339
python -m pip install --upgrade pip setuptools wheel
342-
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
340+
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
343341
python -m pip install git+https://github.com/nedbat/coveragepy.git
344342
python -m pip install versioneer[toml]
345343
python -m pip install python-dateutil pytz cython hypothesis>=6.46.1 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-cov pytest-asyncio>=0.17
346344
python -m pip list
347345
348346
- name: Build Pandas
349347
run: |
350-
python setup.py build_ext -q -j4
351-
python -m pip install -e . --no-build-isolation --no-use-pep517 --no-index
348+
python -m pip install -e . --no-build-isolation --no-index
352349
353350
- name: Build Version
354351
run: |

0 commit comments

Comments
 (0)