Skip to content

Commit 5500240

Browse files
committed
Merge remote-tracking branch 'upstream/1.5.x' into add-recommended-dependencies-as-extras_require-in-setup.cfg
2 parents 1aa9353 + 278c182 commit 5500240

File tree

525 files changed

+12802
-6034
lines changed

Some content is hidden

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

525 files changed

+12802
-6034
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
test-arm:
55
machine:
66
image: ubuntu-2004:202101-01
7-
resource_class: arm.medium
7+
resource_class: arm.large
88
environment:
99
ENV_FILE: ci/deps/circle-38-arm64.yaml
1010
PYTEST_WORKERS: auto

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
push:
55
branches:
66
- main
7+
- 1.5.x
78
- 1.4.x
89
pull_request:
910
branches:
1011
- main
12+
- 1.5.x
1113
- 1.4.x
1214
paths-ignore:
1315
- "doc/**"
@@ -39,8 +41,9 @@ jobs:
3941
. ~/virtualenvs/pandas-dev/bin/activate && \
4042
python -m pip install --no-deps -U pip wheel 'setuptools<60.0.0' && \
4143
pip install cython numpy python-dateutil pytz pytest pytest-xdist pytest-asyncio>=0.17 hypothesis && \
42-
python setup.py build_ext -q -j2 && \
44+
python setup.py build_ext -q -j1 && \
4345
python -m pip install --no-build-isolation --no-use-pep517 -e . && \
46+
python -m pip list && \
4447
export PANDAS_CI=1 && \
4548
pytest -m 'not slow and not network and not clipboard and not single_cpu' pandas --junitxml=test-data.xml"
4649

.github/workflows/code-checks.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
push:
55
branches:
66
- main
7+
- 1.5.x
78
- 1.4.x
89
pull_request:
910
branches:
1011
- main
12+
- 1.5.x
1113
- 1.4.x
1214

1315
env:
@@ -151,6 +153,9 @@ jobs:
151153
- name: Build image
152154
run: docker build --pull --no-cache --tag pandas-dev-env .
153155

156+
- name: Show environment
157+
run: docker run -w /home/pandas pandas-dev-env mamba run -n pandas-dev python -c "import pandas as pd; print(pd.show_versions())"
158+
154159
requirements-dev-text-installable:
155160
name: Test install requirements-dev.txt
156161
runs-on: ubuntu-latest

.github/workflows/codeql.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: CodeQL
2+
on:
3+
schedule:
4+
# every day at midnight
5+
- cron: "0 0 * * *"
6+
7+
concurrency:
8+
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
9+
cancel-in-progress: true
10+
11+
jobs:
12+
analyze:
13+
runs-on: ubuntu-latest
14+
permissions:
15+
actions: read
16+
contents: read
17+
security-events: write
18+
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
language:
23+
- python
24+
25+
steps:
26+
- uses: actions/checkout@v3
27+
- uses: github/codeql-action/init@v2
28+
with:
29+
languages: ${{ matrix.language }}
30+
- uses: github/codeql-action/autobuild@v2
31+
- uses: github/codeql-action/analyze@v2

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ on:
44
push:
55
branches:
66
- main
7+
- 1.5.x
78
- 1.4.x
9+
tags:
10+
- '*'
811
pull_request:
912
branches:
1013
- main
14+
- 1.5.x
1115
- 1.4.x
1216

1317
env:
@@ -49,6 +53,9 @@ jobs:
4953
- name: Build documentation
5054
run: doc/make.py --warnings-are-errors
5155

56+
- name: Build documentation zip
57+
run: doc/make.py zip_html
58+
5259
- name: Build the interactive terminal
5360
run: |
5461
cd web/interactive_terminal
@@ -60,7 +67,7 @@ jobs:
6067
echo "${{ secrets.server_ssh_key }}" > ~/.ssh/id_rsa
6168
chmod 600 ~/.ssh/id_rsa
6269
echo "${{ secrets.server_ip }} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE1Kkopomm7FHG5enATf7SgnpICZ4W2bw+Ho+afqin+w7sMcrsa0je7sbztFAV8YchDkiBKnWTG4cRT+KZgZCaY=" > ~/.ssh/known_hosts
63-
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
70+
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
6471

6572
- name: Copy cheatsheets into site directory
6673
run: cp doc/cheatsheet/Pandas_Cheat_Sheet* web/build/
@@ -73,6 +80,10 @@ jobs:
7380
run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/dev
7481
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
7582

83+
- name: Upload prod docs
84+
run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/version/${GITHUB_REF_NAME:1}
85+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
86+
7687
- name: Move docs into site directory
7788
run: mv doc/build/html web/build/docs
7889

.github/workflows/macos-windows.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
push:
55
branches:
66
- main
7+
- 1.5.x
78
- 1.4.x
89
pull_request:
910
branches:
1011
- main
12+
- 1.5.x
1113
- 1.4.x
1214
paths-ignore:
1315
- "doc/**"
@@ -26,7 +28,7 @@ jobs:
2628
defaults:
2729
run:
2830
shell: bash -el {0}
29-
timeout-minutes: 120
31+
timeout-minutes: 180
3032
strategy:
3133
matrix:
3234
os: [macos-latest, windows-latest]

.github/workflows/python-dev.yml

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
1-
# This file is purposely frozen(does not run). DO NOT DELETE IT
2-
# Unfreeze(by commentingthe if: false() condition) once the
3-
# next Python Dev version has released beta 1 and both Cython and numpy support it
4-
# After that Python has released, migrate the workflows to the
5-
# posix GHA workflows and "freeze" this file by
6-
# uncommenting the if: false() condition
1+
# This workflow may or may not run depending on the state of the next
2+
# unreleased Python version. DO NOT DELETE IT.
3+
#
4+
# In general, this file will remain frozen(present, but not running) until:
5+
# - The next unreleased Python version has released beta 1
6+
# - This version should be available on Github Actions.
7+
# - Our required build/runtime dependencies(numpy, pytz, Cython, python-dateutil)
8+
# support that unreleased Python version.
9+
# To unfreeze, comment out the ``if: false`` condition, and make sure you update
10+
# the name of the workflow and Python version in actions/setup-python to: '3.12-dev'
11+
#
12+
# After it has been unfrozen, this file should remain unfrozen(present, and running) until:
13+
# - The next Python version has been officially released.
14+
# OR
15+
# - Most/All of our optional dependencies support Python 3.11 AND
16+
# - The next Python version has released a rc(we are guaranteed a stable ABI).
17+
# To freeze this file, uncomment out the ``if: false`` condition, and migrate the jobs
18+
# to the corresponding posix/windows-macos/sdist etc. workflows.
719
# Feel free to modify this comment as necessary.
820

921
name: Python Dev
@@ -12,10 +24,12 @@ on:
1224
push:
1325
branches:
1426
- main
27+
- 1.5.x
1528
- 1.4.x
1629
pull_request:
1730
branches:
1831
- main
32+
- 1.5.x
1933
- 1.4.x
2034
paths-ignore:
2135
- "doc/**"
@@ -32,7 +46,7 @@ permissions:
3246

3347
jobs:
3448
build:
35-
if: false # Comment this line out to "unfreeze"
49+
# if: false # Uncomment this to freeze the workflow, comment it to unfreeze
3650
runs-on: ${{ matrix.os }}
3751
strategy:
3852
fail-fast: false
@@ -53,27 +67,28 @@ jobs:
5367
fetch-depth: 0
5468

5569
- name: Set up Python Dev Version
56-
uses: actions/setup-python@v3
70+
uses: actions/setup-python@v4
5771
with:
5872
python-version: '3.11-dev'
5973

6074
- name: Install dependencies
61-
shell: bash -el {0}
6275
run: |
63-
python3 -m pip install --upgrade pip setuptools wheel
64-
python3 -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
65-
python3 -m pip install git+https://github.com/nedbat/coveragepy.git
66-
python3 -m pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov pytest-asyncio>=0.17
67-
python3 -m pip list
76+
python --version
77+
python -m pip install --upgrade pip setuptools wheel
78+
python -m pip install git+https://github.com/numpy/numpy.git
79+
python -m pip install git+https://github.com/nedbat/coveragepy.git
80+
python -m pip install python-dateutil pytz cython hypothesis==6.52.1 pytest>=6.2.5 pytest-xdist pytest-cov pytest-asyncio>=0.17
81+
python -m pip list
6882
83+
# GH 47305: Parallel build can cause flaky ImportError from pandas/_libs/tslibs
6984
- name: Build Pandas
7085
run: |
71-
python3 setup.py build_ext -q -j2
72-
python3 -m pip install -e . --no-build-isolation --no-use-pep517
86+
python setup.py build_ext -q -j1
87+
python -m pip install -e . --no-build-isolation --no-use-pep517
7388
7489
- name: Build Version
7590
run: |
76-
python3 -c "import pandas; pandas.show_versions();"
91+
python -c "import pandas; pandas.show_versions();"
7792
7893
- name: Test
7994
uses: ./.github/actions/run-tests

.github/workflows/sdist.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
push:
55
branches:
66
- main
7+
- 1.5.x
78
- 1.4.x
89
pull_request:
910
branches:
1011
- main
12+
- 1.5.x
1113
- 1.4.x
1214
types: [labeled, opened, synchronize, reopened]
1315
paths-ignore:
@@ -79,9 +81,9 @@ jobs:
7981
run: |
8082
case "${{matrix.python-version}}" in
8183
3.8)
82-
pip install numpy==1.19.5 ;;
84+
pip install numpy==1.20.3 ;;
8385
3.9)
84-
pip install numpy==1.19.5 ;;
86+
pip install numpy==1.20.3 ;;
8587
3.10)
8688
pip install numpy==1.21.2 ;;
8789
esac

.github/workflows/ubuntu.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
push:
55
branches:
66
- main
7+
- 1.5.x
78
- 1.4.x
89
pull_request:
910
branches:
1011
- main
12+
- 1.5.x
1113
- 1.4.x
1214
paths-ignore:
1315
- "doc/**"
@@ -24,7 +26,7 @@ jobs:
2426
defaults:
2527
run:
2628
shell: bash -el {0}
27-
timeout-minutes: 120
29+
timeout-minutes: 180
2830
strategy:
2931
matrix:
3032
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml]
@@ -52,6 +54,10 @@ jobs:
5254
extra_apt: "language-pack-zh-hans"
5355
lang: "zh_CN.utf8"
5456
lc_all: "zh_CN.utf8"
57+
- name: "Copy-on-Write"
58+
env_file: actions-310.yaml
59+
pattern: "not slow and not network and not single_cpu"
60+
pandas_copy_on_write: "1"
5561
- name: "Data Manager"
5662
env_file: actions-38.yaml
5763
pattern: "not slow and not network and not single_cpu"
@@ -64,7 +70,7 @@ jobs:
6470
env_file: actions-310-numpydev.yaml
6571
pattern: "not slow and not network and not single_cpu"
6672
pandas_testing_mode: "deprecate"
67-
test_args: "-W error::DeprecationWarning:numpy"
73+
test_args: "-W error::DeprecationWarning:numpy -W error::FutureWarning:numpy"
6874
exclude:
6975
- env_file: actions-39.yaml
7076
pyarrow_version: "6"
@@ -84,6 +90,7 @@ jobs:
8490
LC_ALL: ${{ matrix.lc_all || '' }}
8591
PANDAS_TESTING_MODE: ${{ matrix.pandas_testing_mode || '' }}
8692
PANDAS_DATA_MANAGER: ${{ matrix.pandas_data_manager || 'block' }}
93+
PANDAS_COPY_ON_WRITE: ${{ matrix.pandas_copy_on_write || '0' }}
8794
TEST_ARGS: ${{ matrix.test_args || '' }}
8895
PYTEST_WORKERS: ${{ contains(matrix.pattern, 'not single_cpu') && 'auto' || '1' }}
8996
PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }}

0 commit comments

Comments
 (0)