Skip to content

Commit fee405b

Browse files
phoflphofl
authored
Merge branch 'main' into pdep8
2 parents 92c6a0a + 132fca0 commit fee405b

File tree

237 files changed

+5062
-3103
lines changed

Some content is hidden

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

237 files changed

+5062
-3103
lines changed

‎.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: 9 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:
@@ -87,3 +89,10 @@ jobs:
8789
name: website
8890
path: web/build
8991
retention-days: 14
92+
93+
- name: Trigger web/doc preview
94+
run: curl -X POST https://pandas.pydata.org/preview/submit/$RUN_ID/$PR_ID/
95+
env:
96+
RUN_ID: ${{ github.run_id }}
97+
PR_ID: ${{ github.event.pull_request.number }}
98+
if: github.event_name == 'pull_request'

‎.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/preview-docs.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Preview docs
2+
on:
3+
issue_comment:
4+
types: created
5+
6+
permissions:
7+
contents: read
8+
9+
jobs:
10+
preview_docs:
11+
permissions:
12+
issues: write
13+
pull-requests: write
14+
runs-on: ubuntu-22.04
15+
steps:
16+
- if: github.event.comment.body == '/preview'
17+
run: |
18+
if curl --output /dev/null --silent --head --fail "https://pandas.pydata.org/preview/${{ github.event.issue.number }}/"; then
19+
curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -d '{"body": "Website preview of this PR available at: https://pandas.pydata.org/preview/${{ github.event.issue.number }}/"}' https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/comments
20+
else
21+
curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -d '{"body": "No preview found for PR #${{ github.event.issue.number }}. Did the docs build complete?"}' https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/comments
22+
fi

‎.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: 3 additions & 5 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
@@ -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,7 +77,6 @@ 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:
8281
- env_file: actions-38.yaml
8382
pyarrow_version: "8"
@@ -97,7 +96,6 @@ jobs:
9796
ENV_FILE: ci/deps/${{ matrix.env_file }}
9897
PATTERN: ${{ matrix.pattern }}
9998
EXTRA_APT: ${{ matrix.extra_apt || '' }}
100-
ERROR_ON_WARNINGS: ${{ matrix.error_on_warnings || '1' }}
10199
LANG: ${{ matrix.lang || '' }}
102100
LC_ALL: ${{ matrix.lc_all || '' }}
103101
PANDAS_DATA_MANAGER: ${{ matrix.pandas_data_manager || 'block' }}

‎.github/workflows/wheels.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ jobs:
173173
pip install hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17
174174
cd .. # Not a good idea to test within the src tree
175175
python -c "import pandas; print(pandas.__version__);
176-
pandas.test(extra_args=['-m not clipboard and not single_cpu', '--skip-slow', '--skip-network', '--skip-db', '-n=2']);
177-
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'])"
178178
- uses: actions/upload-artifact@v3
179179
with:
180180
name: sdist

0 commit comments

Comments
 (0)