Skip to content

Commit 7a9f960

Browse files
committed
Merge Master
2 parents a28c495 + f346574 commit 7a9f960

File tree

1,432 files changed

+109402
-62500
lines changed

Some content is hidden

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

1,432 files changed

+109402
-62500
lines changed

.github/ISSUE_TEMPLATE/documentation_improvement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ labels: "Docs, Needs Triage"
99

1010
#### Location of the documentation
1111

12-
[this should provide the location of the documentation, e.g. "pandas.read_csv" or the URL of the documentation, e.g. "https://dev.pandas.io/docs/reference/api/pandas.read_csv.html"]
12+
[this should provide the location of the documentation, e.g. "pandas.read_csv" or the URL of the documentation, e.g. "https://pandas.pydata.org/docs/reference/api/pandas.read_csv.html"]
1313

1414
**Note**: You can check the latest versions of the docs on `master` [here](https://pandas.pydata.org/docs/dev/).
1515

.github/ISSUE_TEMPLATE/submit_question.md

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Submit Question
2+
description: Ask a general question about pandas
3+
title: "QST: "
4+
labels: [Usage Question, Needs Triage]
5+
6+
body:
7+
- type: markdown
8+
attributes:
9+
value: >
10+
Since [StackOverflow](https://stackoverflow.com) is better suited towards answering
11+
usage questions, we ask that all usage questions are first asked on StackOverflow.
12+
- type: checkboxes
13+
attributes:
14+
options:
15+
- label: >
16+
I have searched the [[pandas] tag](https://stackoverflow.com/questions/tagged/pandas)
17+
on StackOverflow for similar questions.
18+
required: true
19+
- label: >
20+
I have asked my usage related question on [StackOverflow](https://stackoverflow.com).
21+
required: true
22+
- type: input
23+
id: question-link
24+
attributes:
25+
label: Link to question on StackOverflow
26+
validations:
27+
required: true
28+
- type: markdown
29+
attributes:
30+
value: ---
31+
- type: textarea
32+
id: question
33+
attributes:
34+
label: Question about pandas
35+
description: >
36+
**Note**: If you'd still like to submit a question, please read [this guide](
37+
https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports) detailing
38+
how to provide the necessary information for us to reproduce your question.
39+
placeholder: |
40+
```python
41+
# Your code here, if applicable
42+
43+
```
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Build pandas
2+
description: Rebuilds the C extensions and installs pandas
3+
runs:
4+
using: composite
5+
steps:
6+
7+
- name: Environment Detail
8+
run: |
9+
conda info
10+
conda list
11+
shell: bash -l {0}
12+
13+
- name: Build Pandas
14+
run: |
15+
python setup.py build_ext -j 2
16+
python -m pip install -e . --no-build-isolation --no-use-pep517
17+
shell: bash -l {0}

.github/actions/setup/action.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Set up pandas
2+
description: Runs all the setup steps required to have a built pandas ready to use
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Setting conda path
7+
run: echo "${HOME}/miniconda3/bin" >> $GITHUB_PATH
8+
shell: bash -l {0}
9+
10+
- name: Setup environment and build pandas
11+
run: ci/setup_env.sh
12+
shell: bash -l {0}

.github/workflows/ci.yml

Lines changed: 54 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ name: CI
22

33
on:
44
push:
5-
branches: [master]
5+
branches:
6+
- master
7+
- 1.3.x
68
pull_request:
79
branches:
810
- master
9-
- 1.2.x
11+
- 1.3.x
1012

1113
env:
1214
ENV_FILE: environment.yml
@@ -20,13 +22,15 @@ jobs:
2022
run:
2123
shell: bash -l {0}
2224

25+
concurrency:
26+
group: ${{ github.ref }}-checks
27+
cancel-in-progress: ${{github.event_name == 'pull_request'}}
28+
2329
steps:
2430
- name: Checkout
25-
uses: actions/checkout@v1
26-
27-
- name: Looking for unwanted patterns
28-
run: ci/code_checks.sh patterns
29-
if: always()
31+
uses: actions/checkout@v2
32+
with:
33+
fetch-depth: 0
3034

3135
- name: Cache conda
3236
uses: actions/cache@v2
@@ -41,19 +45,8 @@ jobs:
4145
environment-file: ${{ env.ENV_FILE }}
4246
use-only-tar-bz2: true
4347

44-
- name: Environment Detail
45-
run: |
46-
conda info
47-
conda list
48-
4948
- name: Build Pandas
50-
run: |
51-
python setup.py build_ext -j 2
52-
python -m pip install -e . --no-build-isolation --no-use-pep517
53-
54-
- name: Linting
55-
run: ci/code_checks.sh lint
56-
if: always()
49+
uses: ./.github/actions/build_pandas
5750

5851
- name: Checks on imported code
5952
run: ci/code_checks.sh code
@@ -72,7 +65,7 @@ jobs:
7265
if: always()
7366

7467
- name: Testing docstring validation script
75-
run: pytest --capture=no --strict-markers scripts
68+
run: pytest scripts
7669
if: always()
7770

7871
- name: Running benchmarks
@@ -98,16 +91,19 @@ jobs:
9891
web_and_docs:
9992
name: Web and docs
10093
runs-on: ubuntu-latest
101-
steps:
10294

103-
- name: Setting conda path
104-
run: echo "${HOME}/miniconda3/bin" >> $GITHUB_PATH
95+
concurrency:
96+
group: ${{ github.ref }}-web-docs
97+
cancel-in-progress: true
10598

99+
steps:
106100
- name: Checkout
107-
uses: actions/checkout@v1
101+
uses: actions/checkout@v2
102+
with:
103+
fetch-depth: 0
108104

109-
- name: Setup environment and build pandas
110-
run: ci/setup_env.sh
105+
- name: Set up pandas
106+
uses: ./.github/actions/setup
111107

112108
- name: Build website
113109
run: |
@@ -129,31 +125,52 @@ jobs:
129125
echo "${{ secrets.server_ssh_key }}" > ~/.ssh/id_rsa
130126
chmod 600 ~/.ssh/id_rsa
131127
echo "${{ secrets.server_ip }} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE1Kkopomm7FHG5enATf7SgnpICZ4W2bw+Ho+afqin+w7sMcrsa0je7sbztFAV8YchDkiBKnWTG4cRT+KZgZCaY=" > ~/.ssh/known_hosts
132-
if: github.event_name == 'push'
128+
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
133129

134130
- name: Upload web
135131
run: rsync -az --delete --exclude='pandas-docs' --exclude='docs' --exclude='Pandas_Cheat_Sheet*' web/build/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas
136-
if: github.event_name == 'push'
132+
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
137133

138134
- name: Upload dev docs
139135
run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/dev
140-
if: github.event_name == 'push'
136+
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
137+
138+
- name: Move docs into site directory
139+
run: mv doc/build/html web/build/docs
140+
- name: Save website as an artifact
141+
uses: actions/upload-artifact@v2
142+
with:
143+
name: website
144+
path: web/build
145+
retention-days: 14
141146

142147
data_manager:
143148
name: Test experimental data manager
144149
runs-on: ubuntu-latest
145-
steps:
146-
147-
- name: Setting conda path
148-
run: echo "${HOME}/miniconda3/bin" >> $GITHUB_PATH
150+
strategy:
151+
matrix:
152+
pattern: ["not slow and not network and not clipboard", "slow"]
153+
concurrency:
154+
group: ${{ github.ref }}-data_manager-${{ matrix.pattern }}
155+
cancel-in-progress: true
149156

157+
steps:
150158
- name: Checkout
151-
uses: actions/checkout@v1
159+
uses: actions/checkout@v2
160+
with:
161+
fetch-depth: 0
152162

153-
- name: Setup environment and build pandas
154-
run: ci/setup_env.sh
163+
- name: Set up pandas
164+
uses: ./.github/actions/setup
155165

156166
- name: Run tests
167+
env:
168+
PANDAS_DATA_MANAGER: array
169+
PATTERN: ${{ matrix.pattern }}
170+
PYTEST_WORKERS: "auto"
157171
run: |
158172
source activate pandas-dev
159-
pytest pandas/tests/frame/methods --array-manager
173+
ci/run_tests.sh
174+
175+
- name: Print skipped tests
176+
run: python ci/print_skipped.py

.github/workflows/comment_bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ 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 --all-files || (exit 0)
32+
run: pre-commit run --from-ref=origin/master --to-ref=HEAD --all-files || (exit 0)
3333
- name: Commit results
3434
run: |
3535
git config user.name "$(git log -1 --pretty=format:%an)"

0 commit comments

Comments
 (0)