Skip to content

Commit a90441b

Browse files
Merge remote-tracking branch 'upstream/main' into preview_docs
2 parents 9de033b + 9203f9e commit a90441b

File tree

805 files changed

+17078
-10455
lines changed

Some content is hidden

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

805 files changed

+17078
-10455
lines changed

.circleci/config.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,78 @@ jobs:
1818
PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH
1919
LD_PRELOAD=$HOME/miniconda3/envs/pandas-dev/lib/libgomp.so.1:$LD_PRELOAD
2020
ci/run_tests.sh
21+
build-aarch64:
22+
parameters:
23+
cibw-build:
24+
type: string
25+
machine:
26+
image: ubuntu-2004:202101-01
27+
resource_class: arm.large
28+
environment:
29+
ENV_FILE: ci/deps/circle-38-arm64.yaml
30+
TRIGGER_SOURCE: << pipeline.trigger_source >>
31+
steps:
32+
- checkout
33+
- run:
34+
name: Check if build is necessary
35+
command: |
36+
# Check if tag is defined or TRIGGER_SOURCE is scheduled
37+
if [[ -n "$CIRCLE_TAG" ]]; then
38+
echo 'export IS_PUSH="true"' >> "$BASH_ENV"
39+
elif [[ $TRIGGER_SOURCE == "scheduled_pipeline" ]]; then
40+
echo 'export IS_SCHEDULE_DISPATCH="true"' >> "$BASH_ENV"
41+
# Look for the build label/[wheel build] in commit
42+
# grep takes a regex, so need to escape brackets
43+
elif (git log --format=oneline -n 1 $CIRCLE_SHA1) | grep -q '\[wheel build\]'; then
44+
: # Do nothing
45+
elif ! (curl https://api.github.com/repos/pandas-dev/pandas/issues/$CIRCLE_PR_NUMBER | jq '.labels' | grep -q 'Build'); then
46+
circleci-agent step halt
47+
fi
48+
- run:
49+
name: Build aarch64 wheels
50+
command: |
51+
pip3 install cibuildwheel==2.9.0
52+
cibuildwheel --output-dir wheelhouse
53+
environment:
54+
CIBW_BUILD: << parameters.cibw-build >>
55+
56+
- run:
57+
name: Install Anaconda Client & Upload Wheels
58+
command: |
59+
echo "Install Mambaforge"
60+
MAMBA_URL="https://github.com/conda-forge/miniforge/releases/download/4.14.0-0/Mambaforge-4.14.0-0-Linux-aarch64.sh"
61+
echo "Downloading $MAMBA_URL"
62+
wget -q $MAMBA_URL -O minimamba.sh
63+
chmod +x minimamba.sh
64+
65+
MAMBA_DIR="$HOME/miniconda3"
66+
rm -rf $MAMBA_DIR
67+
./minimamba.sh -b -p $MAMBA_DIR
68+
69+
export PATH=$MAMBA_DIR/bin:$PATH
70+
71+
mamba install -y -c conda-forge anaconda-client
72+
73+
source ci/upload_wheels.sh
74+
set_upload_vars
75+
upload_wheels
76+
- store_artifacts:
77+
path: wheelhouse/
2178

2279
workflows:
2380
test:
81+
# Don't run trigger this one when scheduled pipeline runs
82+
when:
83+
not:
84+
equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
2485
jobs:
2586
- test-arm
87+
build-wheels:
88+
jobs:
89+
- build-aarch64:
90+
filters:
91+
tags:
92+
only: /^v.*/
93+
matrix:
94+
parameters:
95+
cibw-build: ["cp38-manylinux_aarch64", "cp39-manylinux_aarch64", "cp310-manylinux_aarch64", "cp311-manylinux_aarch64"]

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
push:
55
branches:
66
- main
7+
- 2.0.x
78
- 1.5.x
89
pull_request:
910
branches:
1011
- main
12+
- 2.0.x
1113
- 1.5.x
1214
paths-ignore:
1315
- "doc/**"
@@ -52,3 +54,7 @@ jobs:
5254
name: Test results
5355
path: test-data.xml
5456
if: failure()
57+
concurrency:
58+
# https://github.community/t/concurrecy-not-work-for-push/183068/7
59+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-32bit
60+
cancel-in-progress: true

.github/workflows/code-checks.yml

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

1315
env:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ on:
44
push:
55
branches:
66
- main
7+
- 2.0.x
78
- 1.5.x
89
tags:
910
- '*'
1011
pull_request:
1112
branches:
1213
- main
14+
- 2.0.x
1315
- 1.5.x
1416

1517
env:

.github/workflows/macos-windows.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@ on:
44
push:
55
branches:
66
- main
7+
- 2.0.x
78
- 1.5.x
89
pull_request:
910
branches:
1011
- main
12+
- 2.0.x
1113
- 1.5.x
1214
paths-ignore:
1315
- "doc/**"
16+
- "web/**"
1417

1518
env:
1619
PANDAS_CI: 1
1720
PYTEST_TARGET: pandas
1821
PATTERN: "not slow and not db and not network and not single_cpu"
19-
ERROR_ON_WARNINGS: "1"
20-
2122

2223
permissions:
2324
contents: read

.github/workflows/package-checks.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
push:
55
branches:
66
- main
7+
- 2.0.x
78
- 1.5.x
89
pull_request:
910
branches:
1011
- main
12+
- 2.0.x
1113
- 1.5.x
1214
types: [ labeled, opened, synchronize, reopened ]
1315

.github/workflows/python-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ on:
3333
- None
3434
paths-ignore:
3535
- "doc/**"
36+
- "web/**"
3637

3738
env:
3839
PYTEST_WORKERS: "auto"

.github/workflows/sdist.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ on:
44
push:
55
branches:
66
- main
7+
- 2.0.x
78
- 1.5.x
89
pull_request:
910
branches:
1011
- main
12+
- 2.0.x
1113
- 1.5.x
1214
types: [labeled, opened, synchronize, reopened]
1315
paths-ignore:
1416
- "doc/**"
17+
- "web/**"
1518

1619
permissions:
1720
contents: read

.github/workflows/ubuntu.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@ on:
44
push:
55
branches:
66
- main
7+
- 2.0.x
78
- 1.5.x
89
pull_request:
910
branches:
1011
- main
12+
- 2.0.x
1113
- 1.5.x
1214
paths-ignore:
1315
- "doc/**"
16+
- "web/**"
1417

1518
env:
1619
PANDAS_CI: 1
@@ -29,7 +32,7 @@ jobs:
2932
matrix:
3033
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml, actions-311.yaml]
3134
pattern: ["not single_cpu", "single_cpu"]
32-
pyarrow_version: ["7", "8", "9", "10"]
35+
pyarrow_version: ["8", "9", "10"]
3336
include:
3437
- name: "Downstream Compat"
3538
env_file: actions-38-downstream_compat.yaml
@@ -38,7 +41,6 @@ jobs:
3841
- name: "Minimum Versions"
3942
env_file: actions-38-minimum_versions.yaml
4043
pattern: "not slow and not network and not single_cpu"
41-
error_on_warnings: "0"
4244
- name: "Locale: it_IT"
4345
env_file: actions-38.yaml
4446
pattern: "not slow and not network and not single_cpu"
@@ -63,12 +65,10 @@ jobs:
6365
env_file: actions-310.yaml
6466
pattern: "not slow and not network and not single_cpu"
6567
pandas_copy_on_write: "1"
66-
error_on_warnings: "0"
6768
- name: "Data Manager"
6869
env_file: actions-38.yaml
6970
pattern: "not slow and not network and not single_cpu"
7071
pandas_data_manager: "array"
71-
error_on_warnings: "0"
7272
- name: "Pypy"
7373
env_file: actions-pypy-38.yaml
7474
pattern: "not slow and not network and not single_cpu"
@@ -77,33 +77,25 @@ jobs:
7777
env_file: actions-310-numpydev.yaml
7878
pattern: "not slow and not network and not single_cpu"
7979
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
80-
error_on_warnings: "0"
8180
exclude:
82-
- env_file: actions-38.yaml
83-
pyarrow_version: "7"
8481
- env_file: actions-38.yaml
8582
pyarrow_version: "8"
8683
- env_file: actions-38.yaml
8784
pyarrow_version: "9"
88-
- env_file: actions-39.yaml
89-
pyarrow_version: "7"
9085
- env_file: actions-39.yaml
9186
pyarrow_version: "8"
9287
- env_file: actions-39.yaml
9388
pyarrow_version: "9"
94-
- env_file: actions-311.yaml
95-
pyarrow_version: "7"
96-
- env_file: actions-311.yaml
89+
- env_file: actions-310.yaml
9790
pyarrow_version: "8"
98-
- env_file: actions-311.yaml
91+
- env_file: actions-310.yaml
9992
pyarrow_version: "9"
10093
fail-fast: false
10194
name: ${{ matrix.name || format('{0} pyarrow={1} {2}', matrix.env_file, matrix.pyarrow_version, matrix.pattern) }}
10295
env:
10396
ENV_FILE: ci/deps/${{ matrix.env_file }}
10497
PATTERN: ${{ matrix.pattern }}
10598
EXTRA_APT: ${{ matrix.extra_apt || '' }}
106-
ERROR_ON_WARNINGS: ${{ matrix.error_on_warnings || '1' }}
10799
LANG: ${{ matrix.lang || '' }}
108100
LC_ALL: ${{ matrix.lc_all || '' }}
109101
PANDAS_DATA_MANAGER: ${{ matrix.pandas_data_manager || 'block' }}

.github/workflows/wheels.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ jobs:
8686
activate-environment: test
8787
channels: conda-forge, anaconda
8888
channel-priority: true
89-
mamba-version: "*"
89+
# mamba fails to solve, also we really don't need this since we're just installing python
90+
# mamba-version: "*"
9091

9192
- name: Test wheels (Windows 64-bit only)
9293
if: ${{ matrix.buildplat[1] == 'win_amd64' }}
@@ -154,7 +155,8 @@ jobs:
154155
python-version: '3.8'
155156
channels: conda-forge
156157
channel-priority: true
157-
mamba-version: "*"
158+
# mamba fails to solve, also we really don't need this since we're just installing python
159+
# mamba-version: "*"
158160

159161
- name: Build sdist
160162
run: |
@@ -171,8 +173,8 @@ jobs:
171173
pip install hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17
172174
cd .. # Not a good idea to test within the src tree
173175
python -c "import pandas; print(pandas.__version__);
174-
pandas.test(extra_args=['-m not clipboard and not single_cpu', '--skip-slow', '--skip-network', '--skip-db', '-n=2']);
175-
pandas.test(extra_args=['-m not clipboard and single_cpu', '--skip-slow', '--skip-network', '--skip-db'])"
176+
pandas.test(extra_args=['-m not clipboard and not single_cpu and not slow and not network and not db', '-n 2']);
177+
pandas.test(extra_args=['-m not clipboard and single_cpu and not slow and not network and not db'])"
176178
- uses: actions/upload-artifact@v3
177179
with:
178180
name: sdist

0 commit comments

Comments
 (0)