Skip to content

Commit b9daceb

Browse files
jbrockmendeljbrockmendel
committed
merge but not passing...
2 parents 27bd89d + ec56dd2 commit b9daceb

File tree

1,116 files changed

+57937
-36494
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,116 files changed

+57937
-36494
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/actions/build_pandas/action.yml‎

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: 77 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,74 +2,74 @@ name: CI
22

33
on:
44
push:
5-
branches: master
5+
branches: [master]
66
pull_request:
77
branches:
88
- master
99
- 1.2.x
1010

1111
env:
1212
ENV_FILE: environment.yml
13+
PANDAS_CI: 1
1314

1415
jobs:
1516
checks:
1617
name: Checks
1718
runs-on: ubuntu-latest
18-
steps:
19-
20-
- name: Setting conda path
21-
run: echo "${HOME}/miniconda3/bin" >> $GITHUB_PATH
19+
defaults:
20+
run:
21+
shell: bash -l {0}
2222

23+
steps:
2324
- name: Checkout
2425
uses: actions/checkout@v1
2526

2627
- name: Looking for unwanted patterns
2728
run: ci/code_checks.sh patterns
2829
if: always()
2930

30-
- name: Setup environment and build pandas
31-
run: ci/setup_env.sh
32-
if: always()
31+
- name: Cache conda
32+
uses: actions/cache@v2
33+
with:
34+
path: ~/conda_pkgs_dir
35+
key: ${{ runner.os }}-conda-${{ hashFiles('${{ env.ENV_FILE }}') }}
36+
37+
- uses: conda-incubator/setup-miniconda@v2
38+
with:
39+
activate-environment: pandas-dev
40+
channel-priority: strict
41+
environment-file: ${{ env.ENV_FILE }}
42+
use-only-tar-bz2: true
43+
44+
- name: Build Pandas
45+
uses: ./.github/actions/build_pandas
3346

3447
- name: Linting
35-
run: |
36-
source activate pandas-dev
37-
ci/code_checks.sh lint
48+
run: ci/code_checks.sh lint
3849
if: always()
3950

4051
- name: Checks on imported code
41-
run: |
42-
source activate pandas-dev
43-
ci/code_checks.sh code
52+
run: ci/code_checks.sh code
4453
if: always()
4554

4655
- name: Running doctests
47-
run: |
48-
source activate pandas-dev
49-
ci/code_checks.sh doctests
56+
run: ci/code_checks.sh doctests
5057
if: always()
5158

5259
- name: Docstring validation
53-
run: |
54-
source activate pandas-dev
55-
ci/code_checks.sh docstrings
60+
run: ci/code_checks.sh docstrings
5661
if: always()
5762

5863
- name: Typing validation
59-
run: |
60-
source activate pandas-dev
61-
ci/code_checks.sh typing
64+
run: ci/code_checks.sh typing
6265
if: always()
6366

6467
- name: Testing docstring validation script
65-
run: |
66-
source activate pandas-dev
67-
pytest --capture=no --strict-markers scripts
68+
run: pytest --capture=no --strict-markers scripts
6869
if: always()
6970

7071
- name: Running benchmarks
7172
run: |
72-
source activate pandas-dev
7373
cd asv_bench
7474
asv check -E existing
7575
git remote add upstream https://github.com/pandas-dev/pandas.git
@@ -93,20 +93,16 @@ jobs:
9393
runs-on: ubuntu-latest
9494
steps:
9595

96-
- name: Setting conda path
97-
run: echo "${HOME}/miniconda3/bin" >> $GITHUB_PATH
98-
9996
- name: Checkout
10097
uses: actions/checkout@v1
10198

102-
- name: Setup environment and build pandas
103-
run: ci/setup_env.sh
99+
- name: Set up pandas
100+
uses: ./.github/actions/setup
104101

105102
- name: Build website
106103
run: |
107104
source activate pandas-dev
108105
python web/pandas_web.py web/pandas --target-path=web/build
109-
110106
- name: Build documentation
111107
run: |
112108
source activate pandas-dev
@@ -132,3 +128,51 @@ jobs:
132128
- name: Upload dev docs
133129
run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/dev
134130
if: github.event_name == 'push'
131+
132+
- name: Move docs into site directory
133+
run: mv doc/build/html web/build/docs
134+
- name: Save website as an artifact
135+
uses: actions/upload-artifact@v2
136+
with:
137+
name: website
138+
path: web/build
139+
retention-days: 14
140+
141+
data_manager:
142+
name: Test experimental data manager
143+
runs-on: ubuntu-latest
144+
steps:
145+
146+
- name: Checkout
147+
uses: actions/checkout@v1
148+
149+
- name: Set up pandas
150+
uses: ./.github/actions/setup
151+
152+
- name: Run tests
153+
env:
154+
PANDAS_DATA_MANAGER: array
155+
run: |
156+
source activate pandas-dev
157+
158+
pytest pandas/tests/frame/methods
159+
pytest pandas/tests/frame/test_constructors.py
160+
pytest pandas/tests/frame/test_*
161+
pytest pandas/tests/frame/test_reductions.py
162+
pytest pandas/tests/reductions/
163+
pytest pandas/tests/generic/test_generic.py
164+
pytest pandas/tests/arithmetic/
165+
pytest pandas/tests/groupby/
166+
pytest pandas/tests/resample/
167+
pytest pandas/tests/reshape/merge
168+
169+
pytest pandas/tests/series/methods
170+
pytest pandas/tests/series/test_*
171+
172+
# indexing subset (temporary since other tests don't pass yet)
173+
pytest pandas/tests/frame/indexing/test_indexing.py::TestDataFrameIndexing::test_setitem_boolean
174+
pytest pandas/tests/frame/indexing/test_where.py
175+
pytest pandas/tests/frame/indexing/test_setitem.py::TestDataFrameSetItem::test_setitem_multi_index
176+
pytest pandas/tests/frame/indexing/test_setitem.py::TestDataFrameSetItem::test_setitem_listlike_indexer_duplicate_columns
177+
pytest pandas/tests/indexing/multiindex/test_setitem.py::TestMultiIndexSetItem::test_astype_assignment_with_dups
178+
pytest pandas/tests/indexing/multiindex/test_setitem.py::TestMultiIndexSetItem::test_frame_setitem_multi_column

‎.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)"

‎.github/workflows/database.yml‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,8 @@ jobs:
7272
environment-file: ${{ env.ENV_FILE }}
7373
use-only-tar-bz2: true
7474

75-
- name: Environment Detail
76-
run: |
77-
conda info
78-
conda list
79-
8075
- name: Build Pandas
81-
run: |
82-
python setup.py build_ext -j 2
83-
python -m pip install -e . --no-build-isolation --no-use-pep517
76+
uses: ./.github/actions/build_pandas
8477

8578
- name: Test
8679
run: ci/run_tests.sh
@@ -158,15 +151,8 @@ jobs:
158151
environment-file: ${{ env.ENV_FILE }}
159152
use-only-tar-bz2: true
160153

161-
- name: Environment Detail
162-
run: |
163-
conda info
164-
conda list
165-
166154
- name: Build Pandas
167-
run: |
168-
python setup.py build_ext -j 2
169-
python -m pip install -e . --no-build-isolation --no-use-pep517
155+
uses: ./.github/actions/build_pandas
170156

171157
- name: Test
172158
run: ci/run_tests.sh
@@ -184,3 +170,11 @@ jobs:
184170

185171
- name: Print skipped tests
186172
run: python ci/print_skipped.py
173+
174+
- name: Upload coverage to Codecov
175+
uses: codecov/codecov-action@v1
176+
with:
177+
files: /tmp/test_coverage.xml
178+
flags: unittests
179+
name: codecov-pandas
180+
fail_ci_if_error: true

0 commit comments

Comments
 (0)