Skip to content

Commit cc24c9a

Browse files
pckSFpckSF
committed
Merge upstream/master as required pandas-dev#41283 was merged
2 parents 7bf21ec + 2499a76 commit cc24c9a

File tree

744 files changed

+30945
-16792
lines changed

Some content is hidden

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

744 files changed

+30945
-16792
lines changed

‎.github/workflows/ci.yml

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ name: CI
22

33
on:
44
push:
5-
branches: [master]
5+
branches:
6+
- master
67
pull_request:
78
branches:
89
- master
9-
- 1.2.x
10+
- 1.3.x
1011

1112
env:
1213
ENV_FILE: environment.yml
@@ -20,9 +21,15 @@ jobs:
2021
run:
2122
shell: bash -l {0}
2223

24+
concurrency:
25+
group: ${{ github.ref }}-checks
26+
cancel-in-progress: true
27+
2328
steps:
2429
- name: Checkout
25-
uses: actions/checkout@v1
30+
uses: actions/checkout@v2
31+
with:
32+
fetch-depth: 0
2633

2734
- name: Looking for unwanted patterns
2835
run: ci/code_checks.sh patterns
@@ -91,10 +98,16 @@ jobs:
9198
web_and_docs:
9299
name: Web and docs
93100
runs-on: ubuntu-latest
94-
steps:
95101

102+
concurrency:
103+
group: ${{ github.ref }}-web-docs
104+
cancel-in-progress: true
105+
106+
steps:
96107
- name: Checkout
97-
uses: actions/checkout@v1
108+
uses: actions/checkout@v2
109+
with:
110+
fetch-depth: 0
98111

99112
- name: Set up pandas
100113
uses: ./.github/actions/setup
@@ -144,10 +157,15 @@ jobs:
144157
strategy:
145158
matrix:
146159
pattern: ["not slow and not network and not clipboard", "slow"]
147-
steps:
160+
concurrency:
161+
group: ${{ github.ref }}-data_manager-${{ matrix.pattern }}
162+
cancel-in-progress: true
148163

164+
steps:
149165
- name: Checkout
150-
uses: actions/checkout@v1
166+
uses: actions/checkout@v2
167+
with:
168+
fetch-depth: 0
151169

152170
- name: Set up pandas
153171
uses: ./.github/actions/setup

‎.github/workflows/database.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ name: Database
22

33
on:
44
push:
5-
branches: [master]
5+
branches:
6+
- master
67
pull_request:
78
branches:
89
- master
9-
- 1.2.x
10+
- 1.3.x
11+
paths-ignore:
12+
- "doc/**"
1013

1114
env:
1215
PYTEST_WORKERS: "auto"
@@ -15,17 +18,21 @@ env:
1518
COVERAGE: true
1619

1720
jobs:
18-
Linux_py37_IO:
21+
Linux_py38_IO:
1922
runs-on: ubuntu-latest
2023
defaults:
2124
run:
2225
shell: bash -l {0}
2326

2427
strategy:
2528
matrix:
26-
ENV_FILE: [ci/deps/actions-37-db-min.yaml, ci/deps/actions-37-db.yaml]
29+
ENV_FILE: [ci/deps/actions-38-db-min.yaml, ci/deps/actions-38-db.yaml]
2730
fail-fast: false
2831

32+
concurrency:
33+
group: ${{ github.ref }}-${{ matrix.ENV_FILE }}
34+
cancel-in-progress: true
35+
2936
services:
3037
mysql:
3138
image: mysql
@@ -56,10 +63,12 @@ jobs:
5663

5764
steps:
5865
- name: Checkout
59-
uses: actions/checkout@v1
66+
uses: actions/checkout@v2
67+
with:
68+
fetch-depth: 0
6069

6170
- name: Cache conda
62-
uses: actions/cache@v1
71+
uses: actions/cache@v2
6372
env:
6473
CACHE_NUMBER: 0
6574
with:
@@ -70,7 +79,7 @@ jobs:
7079
- uses: conda-incubator/setup-miniconda@v2
7180
with:
7281
activate-environment: pandas-dev
73-
channel-priority: strict
82+
channel-priority: flexible
7483
environment-file: ${{ matrix.ENV_FILE }}
7584
use-only-tar-bz2: true
7685

‎.github/workflows/posix.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ name: Posix
22

33
on:
44
push:
5-
branches: [master]
5+
branches:
6+
- master
67
pull_request:
78
branches:
89
- master
9-
- 1.2.x
10+
- 1.3.x
11+
paths-ignore:
12+
- "doc/**"
1013

1114
env:
1215
PYTEST_WORKERS: "auto"
@@ -21,14 +24,13 @@ jobs:
2124
strategy:
2225
matrix:
2326
settings: [
24-
[actions-37-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
25-
[actions-37.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
26-
[actions-37-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
27-
[actions-37-slow.yaml, "slow", "", "", "", "", ""],
27+
[actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
28+
[actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
2829
[actions-38.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
2930
[actions-38-slow.yaml, "slow", "", "", "", "", ""],
3031
[actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
31-
[actions-38-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
32+
[actions-39-slow.yaml, "slow", "", "", "", "", ""],
33+
[actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
3234
[actions-39.yaml, "not slow and not network and not clipboard", "", "", "", "", ""]
3335
]
3436
fail-fast: false
@@ -41,13 +43,18 @@ jobs:
4143
LC_ALL: ${{ matrix.settings[4] }}
4244
PANDAS_TESTING_MODE: ${{ matrix.settings[5] }}
4345
TEST_ARGS: ${{ matrix.settings[6] }}
46+
concurrency:
47+
group: ${{ github.ref }}-${{ matrix.settings[0] }}
48+
cancel-in-progress: true
4449

4550
steps:
4651
- name: Checkout
47-
uses: actions/checkout@v1
52+
uses: actions/checkout@v2
53+
with:
54+
fetch-depth: 0
4855

4956
- name: Cache conda
50-
uses: actions/cache@v1
57+
uses: actions/cache@v2
5158
env:
5259
CACHE_NUMBER: 0
5360
with:

‎.github/workflows/pre-commit.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@ name: pre-commit
33
on:
44
pull_request:
55
push:
6-
branches: [master]
6+
branches:
7+
- master
78

89
jobs:
910
pre-commit:
1011
runs-on: ubuntu-latest
12+
concurrency:
13+
group: ${{ github.ref }}-pre-commit
14+
cancel-in-progress: true
1115
steps:
1216
- uses: actions/checkout@v2
1317
- uses: actions/setup-python@v2

‎.github/workflows/python-dev.yml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
name: Python Dev
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- 1.3.x
8+
pull_request:
9+
branches:
10+
- master
11+
paths-ignore:
12+
- "doc/**"
13+
14+
env:
15+
PYTEST_WORKERS: "auto"
16+
PANDAS_CI: 1
17+
PATTERN: "not slow and not network and not clipboard"
18+
COVERAGE: true
19+
20+
jobs:
21+
build:
22+
runs-on: ubuntu-latest
23+
name: actions-310-dev
24+
timeout-minutes: 60
25+
26+
concurrency:
27+
group: ${{ github.ref }}-dev
28+
cancel-in-progress: true
29+
30+
steps:
31+
- uses: actions/checkout@v2
32+
with:
33+
fetch-depth: 0
34+
35+
- name: Set up Python Dev Version
36+
uses: actions/setup-python@v2
37+
with:
38+
python-version: '3.10-dev'
39+
40+
- name: Install dependencies
41+
run: |
42+
python -m pip install --upgrade pip setuptools wheel
43+
pip install git+https://github.com/numpy/numpy.git
44+
pip install git+https://github.com/pytest-dev/pytest.git
45+
pip install git+https://github.com/nedbat/coveragepy.git
46+
pip install cython python-dateutil pytz hypothesis pytest-xdist pytest-cov
47+
pip list
48+
49+
- name: Build Pandas
50+
run: |
51+
python setup.py build_ext -q -j2
52+
python -m pip install -e . --no-build-isolation --no-use-pep517
53+
54+
- name: Build Version
55+
run: |
56+
python -c "import pandas; pandas.show_versions();"
57+
58+
- name: Test with pytest
59+
run: |
60+
ci/run_tests.sh
61+
# GH 41935
62+
continue-on-error: true
63+
64+
- name: Publish test results
65+
uses: actions/upload-artifact@master
66+
with:
67+
name: Test results
68+
path: test-data.xml
69+
if: failure()
70+
71+
- name: Print skipped tests
72+
run: |
73+
python ci/print_skipped.py
74+
75+
- name: Report Coverage
76+
run: |
77+
coverage report -m
78+
79+
- name: Upload coverage to Codecov
80+
uses: codecov/codecov-action@v1
81+
with:
82+
flags: unittests
83+
name: codecov-pandas
84+
fail_ci_if_error: true

‎.github/workflows/sdist.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: sdist
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
- 1.3.x
11+
paths-ignore:
12+
- "doc/**"
13+
14+
jobs:
15+
build:
16+
runs-on: ubuntu-latest
17+
timeout-minutes: 60
18+
defaults:
19+
run:
20+
shell: bash -l {0}
21+
22+
strategy:
23+
fail-fast: false
24+
matrix:
25+
python-version: ["3.8", "3.9"]
26+
27+
steps:
28+
- uses: actions/checkout@v2
29+
with:
30+
fetch-depth: 0
31+
32+
- name: Set up Python
33+
uses: actions/setup-python@v2
34+
with:
35+
python-version: ${{ matrix.python-version }}
36+
37+
- name: Install dependencies
38+
run: |
39+
python -m pip install --upgrade pip setuptools wheel
40+
41+
# GH 39416
42+
pip install numpy
43+
44+
- name: Build pandas sdist
45+
run: |
46+
pip list
47+
python setup.py sdist --formats=gztar
48+
49+
- uses: conda-incubator/setup-miniconda@v2
50+
with:
51+
activate-environment: pandas-sdist
52+
python-version: ${{ matrix.python-version }}
53+
54+
- name: Install pandas from sdist
55+
run: |
56+
conda list
57+
python -m pip install dist/*.gz
58+
59+
- name: Import pandas
60+
run: |
61+
cd ..
62+
conda list
63+
python -c "import pandas; pandas.show_versions();"

0 commit comments

Comments
 (0)