Skip to content

Commit ebb0709

Browse files
committed
2 parents cafe909 + 20d0964 commit ebb0709

File tree

363 files changed

+5645
-3504
lines changed

Some content is hidden

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

363 files changed

+5645
-3504
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ body:
1717
[latest version](https://pandas.pydata.org/docs/whatsnew/index.html) of pandas.
1818
required: true
1919
- label: >
20-
I have confirmed this bug exists on the master branch of pandas.
20+
I have confirmed this bug exists on the main branch of pandas.
2121
- type: textarea
2222
id: example
2323
attributes:

.github/ISSUE_TEMPLATE/documentation_improvement.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ body:
1010
options:
1111
- label: >
1212
I have checked that the issue still exists on the latest versions of the docs
13-
on `master` [here](https://pandas.pydata.org/docs/dev/)
13+
on `main` [here](https://pandas.pydata.org/docs/dev/)
1414
required: true
1515
- type: textarea
1616
id: location

.github/ISSUE_TEMPLATE/performance_issue.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ body:
1717
[latest version](https://pandas.pydata.org/docs/whatsnew/index.html) of pandas.
1818
required: true
1919
- label: >
20-
I have confirmed this issue exists on the master branch of pandas.
20+
I have confirmed this issue exists on the main branch of pandas.
2121
- type: textarea
2222
id: example
2323
attributes:

.github/workflows/assign.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ on:
44
types: created
55

66
jobs:
7-
one:
7+
issue_assign:
88
runs-on: ubuntu-latest
99
steps:
1010
- if: github.event.comment.body == 'take'
11-
name:
1211
run: |
1312
echo "Assigning issue ${{ github.event.issue.number }} to ${{ github.event.comment.user.login }}"
1413
curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -d '{"assignees": ["${{ github.event.comment.user.login }}"]}' https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/assignees

.github/workflows/asv-bot.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,21 @@ jobs:
5959
git remote add upstream https://github.com/pandas-dev/pandas.git
6060
git fetch upstream
6161
asv machine --yes
62-
asv continuous -f 1.1 -b $REGEX upstream/master HEAD
62+
asv continuous -f 1.1 -b $REGEX upstream/main HEAD
6363
echo 'BENCH_OUTPUT<<EOF' >> $GITHUB_ENV
64-
asv compare -f 1.1 upstream/master HEAD >> $GITHUB_ENV
64+
asv compare -f 1.1 upstream/main HEAD >> $GITHUB_ENV
6565
echo 'EOF' >> $GITHUB_ENV
6666
echo "REGEX=$REGEX" >> $GITHUB_ENV
6767
68-
- uses: actions/github-script@v4
68+
- uses: actions/github-script@v5
6969
env:
7070
BENCH_OUTPUT: ${{env.BENCH_OUTPUT}}
7171
REGEX: ${{env.REGEX}}
7272
with:
7373
script: |
7474
const ENV_VARS = process.env
7575
const run_url = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`
76-
github.issues.createComment({
76+
github.rest.issues.createComment({
7777
issue_number: context.issue.number,
7878
owner: context.repo.owner,
7979
repo: context.repo.repo,

.github/workflows/code-checks.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Code Checks
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- 1.4.x
88
pull_request:
99
branches:
10-
- master
10+
- main
1111
- 1.4.x
1212

1313
env:
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Install pyright
7676
# note: keep version in sync with .pre-commit-config.yaml
77-
run: npm install -g [email protected].202
77+
run: npm install -g [email protected].212
7878

7979
- name: Build Pandas
8080
id: build
@@ -151,7 +151,7 @@ jobs:
151151
if: ${{ steps.build.outcome == 'success' }}
152152

153153
- name: Publish benchmarks artifact
154-
uses: actions/upload-artifact@master
154+
uses: actions/upload-artifact@v2
155155
with:
156156
name: Benchmarks log
157157
path: asv_bench/benchmarks.log

.github/workflows/comment_bot.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v2
16-
- uses: r-lib/actions/pr-fetch@master
16+
- uses: r-lib/actions/pr-fetch@v2
1717
with:
1818
repo-token: ${{ secrets.GITHUB_TOKEN }}
1919
- name: Cache multiple paths
@@ -29,12 +29,12 @@ jobs:
2929
- name: Install-pre-commit
3030
run: python -m pip install --upgrade pre-commit
3131
- name: Run pre-commit
32-
run: pre-commit run --from-ref=origin/master --to-ref=HEAD --all-files || (exit 0)
32+
run: pre-commit run --from-ref=origin/main --to-ref=HEAD --all-files || (exit 0)
3333
- name: Commit results
3434
run: |
3535
git config user.name "$(git log -1 --pretty=format:%an)"
3636
git config user.email "$(git log -1 --pretty=format:%ae)"
3737
git commit -a -m 'Fixes from pre-commit [automated commit]' || echo "No changes to commit"
38-
- uses: r-lib/actions/pr-push@master
38+
- uses: r-lib/actions/pr-push@v2
3939
with:
4040
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/datamanger.yml

+6-10
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ name: Data Manager
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- 1.4.x
88
pull_request:
99
branches:
10-
- master
10+
- main
1111
- 1.4.x
12+
paths-ignore:
13+
- "doc/**"
1214

1315
env:
1416
ENV_FILE: environment.yml
@@ -26,12 +28,9 @@ jobs:
2628
AWS_SECRET_ACCESS_KEY: foobar_secret
2729
ports:
2830
- 5000:5000
29-
strategy:
30-
matrix:
31-
pattern: ["not slow and not network and not clipboard", "slow"]
3231
concurrency:
3332
# https://github.community/t/concurrecy-not-work-for-push/183068/7
34-
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-data_manager-${{ matrix.pattern }}
33+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-data_manager
3534
cancel-in-progress: true
3635

3736
steps:
@@ -46,12 +45,9 @@ jobs:
4645
- name: Run tests
4746
env:
4847
PANDAS_DATA_MANAGER: array
49-
PATTERN: ${{ matrix.pattern }}
48+
PATTERN: "not network and not clipboard"
5049
PYTEST_WORKERS: "auto"
5150
PYTEST_TARGET: pandas
5251
run: |
5352
source activate pandas-dev
5453
ci/run_tests.sh
55-
56-
- name: Print skipped tests
57-
run: python ci/print_skipped.py

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

+6-11
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Doc Build and Upload
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- 1.4.x
88
pull_request:
99
branches:
10-
- master
10+
- main
1111
- 1.4.x
1212

1313
env:
@@ -40,31 +40,26 @@ jobs:
4040
- name: Build documentation
4141
run: |
4242
source activate pandas-dev
43-
doc/make.py --warnings-are-errors | tee sphinx.log ; exit ${PIPESTATUS[0]}
44-
45-
# This can be removed when the ipython directive fails when there are errors,
46-
# including the `tee sphinx.log` in te previous step (https://github.com/ipython/ipython/issues/11547)
47-
- name: Check ipython directive errors
48-
run: "! grep -B10 \"^<<<-------------------------------------------------------------------------$\" sphinx.log"
43+
doc/make.py --warnings-are-errors
4944
5045
- name: Install ssh key
5146
run: |
5247
mkdir -m 700 -p ~/.ssh
5348
echo "${{ secrets.server_ssh_key }}" > ~/.ssh/id_rsa
5449
chmod 600 ~/.ssh/id_rsa
5550
echo "${{ secrets.server_ip }} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE1Kkopomm7FHG5enATf7SgnpICZ4W2bw+Ho+afqin+w7sMcrsa0je7sbztFAV8YchDkiBKnWTG4cRT+KZgZCaY=" > ~/.ssh/known_hosts
56-
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
51+
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/main'}}
5752

5853
- name: Copy cheatsheets into site directory
5954
run: cp doc/cheatsheet/Pandas_Cheat_Sheet* web/build/
6055

6156
- name: Upload web
6257
run: rsync -az --delete --exclude='pandas-docs' --exclude='docs' web/build/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas
63-
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
58+
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/main'}}
6459

6560
- name: Upload dev docs
6661
run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/dev
67-
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
62+
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/main'}}
6863

6964
- name: Move docs into site directory
7065
run: mv doc/build/html web/build/docs

.github/workflows/posix.yml

+12-17
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Posix
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- 1.4.x
88
pull_request:
99
branches:
10-
- master
10+
- main
1111
- 1.4.x
1212
paths-ignore:
1313
- "doc/**"
@@ -26,16 +26,14 @@ jobs:
2626
matrix:
2727
settings: [
2828
[actions-38-downstream_compat.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
29-
[actions-38-minimum_versions.yaml, "slow", "", "", "", "", ""],
30-
[actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
31-
[actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
32-
[actions-38.yaml, "not slow and not clipboard", "", "", "", "", ""],
33-
[actions-38-slow.yaml, "slow", "", "", "", "", ""],
34-
[actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
35-
[actions-39-slow.yaml, "slow", "", "", "", "", ""],
29+
[actions-38-minimum_versions.yaml, "not clipboard", "", "", "", "", ""],
30+
[actions-38.yaml, "not slow and not network", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
31+
[actions-38.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
32+
[actions-38.yaml, "not clipboard", "", "", "", "", ""],
3633
[actions-pypy-38.yaml, "not slow and not clipboard", "", "", "", "", "--max-worker-restart 0"],
37-
[actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
38-
[actions-39.yaml, "not slow and not clipboard", "", "", "", "", ""]
34+
[actions-39.yaml, "not clipboard", "", "", "", "", ""],
35+
[actions-310-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
36+
[actions-310.yaml, "not clipboard", "", "", "", "", ""],
3937
]
4038
fail-fast: false
4139
env:
@@ -52,7 +50,7 @@ jobs:
5250
COVERAGE: ${{ !contains(matrix.settings[0], 'pypy') }}
5351
concurrency:
5452
# https://github.community/t/concurrecy-not-work-for-push/183068/7
55-
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.settings[0] }}
53+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.settings[0] }}-${{ matrix.settings[1] }}-${{ matrix.settings[2] }}
5654
cancel-in-progress: true
5755

5856
services:
@@ -120,7 +118,7 @@ jobs:
120118
if: ${{ env.IS_PYPY == 'false' }} # No pypy3.8 support
121119

122120
- name: Setup PyPy
123-
uses: actions/setup-python@v2.3.1
121+
uses: actions/setup-python@v2
124122
with:
125123
python-version: "pypy-3.8"
126124
if: ${{ env.IS_PYPY == 'true' }}
@@ -146,15 +144,12 @@ jobs:
146144
run: pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
147145

148146
- name: Publish test results
149-
uses: actions/upload-artifact@master
147+
uses: actions/upload-artifact@v2
150148
with:
151149
name: Test results
152150
path: test-data.xml
153151
if: failure()
154152

155-
- name: Print skipped tests
156-
run: python ci/print_skipped.py
157-
158153
- name: Upload coverage to Codecov
159154
uses: codecov/codecov-action@v2
160155
with:

.github/workflows/python-dev.yml

+14-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +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/Azure pipelines and "freeze" this file by
6+
# uncommenting the if: false() condition
7+
# Feel free to modify this comment as necessary.
8+
19
name: Python Dev
210

311
on:
412
push:
513
branches:
6-
- master
14+
- main
715
- 1.4.x
816
pull_request:
917
branches:
10-
- master
18+
- main
1119
- 1.4.x
1220
paths-ignore:
1321
- "doc/**"
@@ -21,13 +29,14 @@ env:
2129

2230
jobs:
2331
build:
32+
if: false # Comment this line out to "unfreeze"
2433
runs-on: ${{ matrix.os }}
2534
strategy:
2635
fail-fast: false
2736
matrix:
2837
os: [ubuntu-latest, macOS-latest, windows-latest]
2938

30-
name: actions-310-dev
39+
name: actions-311-dev
3140
timeout-minutes: 80
3241

3342
concurrency:
@@ -43,7 +52,7 @@ jobs:
4352
- name: Set up Python Dev Version
4453
uses: actions/setup-python@v2
4554
with:
46-
python-version: '3.10-dev'
55+
python-version: '3.11-dev'
4756

4857
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
4958
- name: Install dependencies
@@ -70,16 +79,12 @@ jobs:
7079
ci/run_tests.sh
7180
7281
- name: Publish test results
73-
uses: actions/upload-artifact@master
82+
uses: actions/upload-artifact@v2
7483
with:
7584
name: Test results
7685
path: test-data.xml
7786
if: failure()
7887

79-
- name: Print skipped tests
80-
run: |
81-
python ci/print_skipped.py
82-
8388
- name: Report Coverage
8489
run: |
8590
coverage report -m

.github/workflows/sdist.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: sdist
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- 1.4.x
88
pull_request:
99
branches:
10-
- master
10+
- main
1111
- 1.4.x
1212
paths-ignore:
1313
- "doc/**"

.github/workflows/stale-pr.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
stale-pr-message: "This pull request is stale because it has been open for thirty days with no activity. Please [update](https://pandas.pydata.org/pandas-docs/stable/development/contributing.html#updating-your-pull-request) and respond to this comment if you're still interested in working on this."
1515
stale-pr-label: "Stale"
1616
exempt-pr-labels: "Needs Review,Blocked,Needs Discussion"
17-
days-before-stale: 30
17+
days-before-issue-stale: -1
18+
days-before-pr-stale: 30
1819
days-before-close: -1
1920
remove-stale-when-updated: false
2021
debug-only: false

0 commit comments

Comments
 (0)