Skip to content

Commit 6984c7e

Browse files
committed
Merge branch 'main' of https://github.com/pandas-dev/pandas into pdep11
2 parents e45bfeb + 94e868a commit 6984c7e

File tree

433 files changed

+6082
-6044
lines changed

Some content is hidden

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

433 files changed

+6082
-6044
lines changed

.circleci/config.yml

Lines changed: 2 additions & 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-38-arm64.yaml
9+
ENV_FILE: ci/deps/circle-39-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"
@@ -92,4 +92,4 @@ workflows:
9292
only: /^v.*/
9393
matrix:
9494
parameters:
95-
cibw-build: ["cp38-manylinux_aarch64", "cp39-manylinux_aarch64", "cp310-manylinux_aarch64", "cp311-manylinux_aarch64"]
95+
cibw-build: ["cp39-manylinux_aarch64", "cp310-manylinux_aarch64", "cp311-manylinux_aarch64"]

.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/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/run-tests/action.yml

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

99
- name: Publish test results
10-
uses: actions/upload-artifact@v2
10+
uses: actions/upload-artifact@v3
1111
with:
1212
name: Test results
1313
path: test-data.xml
@@ -19,7 +19,7 @@ runs:
1919
if: failure()
2020

2121
- name: Upload coverage to Codecov
22-
uses: codecov/codecov-action@v2
22+
uses: codecov/codecov-action@v3
2323
with:
2424
flags: unittests
2525
name: codecov-pandas

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ runs:
1313
using: composite
1414
steps:
1515
- name: Install ${{ inputs.environment-file }}
16-
uses: mamba-org/provision-with-micromamba@v12
16+
uses: mamba-org/provision-with-micromamba@v15
1717
with:
1818
environment-file: ${{ inputs.environment-file }}
1919
environment-name: ${{ inputs.environment-name }}

.github/workflows/32-bit-linux.yml

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

.github/workflows/code-checks.yml

Lines changed: 17 additions & 5 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() }}
@@ -179,7 +191,7 @@ jobs:
179191
id: setup_python
180192
uses: actions/setup-python@v4
181193
with:
182-
python-version: '3.8'
194+
python-version: '3.10'
183195
cache: 'pip'
184196
cache-dependency-path: 'requirements-dev.txt'
185197

.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/macos-windows.yml

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

.github/workflows/package-checks.yml

Lines changed: 39 additions & 8 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'}}
@@ -38,15 +42,42 @@ jobs:
3842
id: setup_python
3943
uses: actions/setup-python@v4
4044
with:
41-
python-version: '3.8'
42-
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}
45+
python-version: '3.10'
4846

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://github.community/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/provision-with-micromamba@v15
71+
with:
72+
environment-file: false
73+
environment-name: recipe-test
74+
extra-specs: |
75+
python=${{ matrix.python-version }}
76+
boa
77+
conda-verify
78+
channels: conda-forge
79+
cache-downloads: true
80+
cache-env: true
81+
82+
- name: Build conda package
83+
run: conda mambabuild ci --no-anaconda-upload --verify --strict-verify --output --output-folder .

0 commit comments

Comments
 (0)