Skip to content

Commit 395ad54

Browse files
lmcindewarlmcindewar
committed
Merge remote-tracking branch 'upstream/master' into GH38454-export-stata-value-labels
2 parents 1eff1bc + 1cbf344 commit 395ad54

File tree

839 files changed

+37801
-21056
lines changed

Some content is hidden

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

839 files changed

+37801
-21056
lines changed

‎.github/workflows/ci.yml

Lines changed: 30 additions & 11 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,9 +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
31+
uses: actions/checkout@v2
32+
with:
33+
fetch-depth: 0
2634

2735
- name: Looking for unwanted patterns
2836
run: ci/code_checks.sh patterns
@@ -65,7 +73,7 @@ jobs:
6573
if: always()
6674

6775
- name: Testing docstring validation script
68-
run: pytest --capture=no --strict-markers scripts
76+
run: pytest scripts
6977
if: always()
7078

7179
- name: Running benchmarks
@@ -91,10 +99,16 @@ jobs:
9199
web_and_docs:
92100
name: Web and docs
93101
runs-on: ubuntu-latest
94-
steps:
95102

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

99113
- name: Set up pandas
100114
uses: ./.github/actions/setup
@@ -119,15 +133,15 @@ jobs:
119133
echo "${{ secrets.server_ssh_key }}" > ~/.ssh/id_rsa
120134
chmod 600 ~/.ssh/id_rsa
121135
echo "${{ secrets.server_ip }} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE1Kkopomm7FHG5enATf7SgnpICZ4W2bw+Ho+afqin+w7sMcrsa0je7sbztFAV8YchDkiBKnWTG4cRT+KZgZCaY=" > ~/.ssh/known_hosts
122-
if: github.event_name == 'push'
136+
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
123137

124138
- name: Upload web
125139
run: rsync -az --delete --exclude='pandas-docs' --exclude='docs' --exclude='Pandas_Cheat_Sheet*' web/build/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas
126-
if: github.event_name == 'push'
140+
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
127141

128142
- name: Upload dev docs
129143
run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/dev
130-
if: github.event_name == 'push'
144+
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
131145

132146
- name: Move docs into site directory
133147
run: mv doc/build/html web/build/docs
@@ -144,10 +158,15 @@ jobs:
144158
strategy:
145159
matrix:
146160
pattern: ["not slow and not network and not clipboard", "slow"]
147-
steps:
161+
concurrency:
162+
group: ${{ github.ref }}-data_manager-${{ matrix.pattern }}
163+
cancel-in-progress: true
148164

165+
steps:
149166
- name: Checkout
150-
uses: actions/checkout@v1
167+
uses: actions/checkout@v2
168+
with:
169+
fetch-depth: 0
151170

152171
- name: Set up pandas
153172
uses: ./.github/actions/setup

‎.github/workflows/database.yml

Lines changed: 17 additions & 8 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: ${{github.event_name == 'pull_request'}}
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,15 +79,15 @@ 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

7786
- name: Build Pandas
7887
uses: ./.github/actions/build_pandas
7988

8089
- name: Test
81-
run: pytest -m "${{ env.PATTERN }}" -n 2 --dist=loadfile -s --strict-markers --durations=30 --junitxml=test-data.xml -s --cov=pandas --cov-report=xml pandas/tests/io
90+
run: pytest -m "${{ env.PATTERN }}" -n 2 --dist=loadfile --cov=pandas --cov-report=xml pandas/tests/io
8291
if: always()
8392

8493
- name: Build Version

‎.github/workflows/posix.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ name: Posix
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
12+
paths-ignore:
13+
- "doc/**"
1014

1115
env:
1216
PYTEST_WORKERS: "auto"
@@ -21,14 +25,13 @@ jobs:
2125
strategy:
2226
matrix:
2327
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", "", "", "", "", ""],
28+
[actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
29+
[actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
2830
[actions-38.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
2931
[actions-38-slow.yaml, "slow", "", "", "", "", ""],
3032
[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"],
33+
[actions-39-slow.yaml, "slow", "", "", "", "", ""],
34+
[actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
3235
[actions-39.yaml, "not slow and not network and not clipboard", "", "", "", "", ""]
3336
]
3437
fail-fast: false
@@ -41,13 +44,18 @@ jobs:
4144
LC_ALL: ${{ matrix.settings[4] }}
4245
PANDAS_TESTING_MODE: ${{ matrix.settings[5] }}
4346
TEST_ARGS: ${{ matrix.settings[6] }}
47+
concurrency:
48+
group: ${{ github.ref }}-${{ matrix.settings[0] }}
49+
cancel-in-progress: ${{github.event_name == 'pull_request'}}
4450

4551
steps:
4652
- name: Checkout
47-
uses: actions/checkout@v1
53+
uses: actions/checkout@v2
54+
with:
55+
fetch-depth: 0
4856

4957
- name: Cache conda
50-
uses: actions/cache@v1
58+
uses: actions/cache@v2
5159
env:
5260
CACHE_NUMBER: 0
5361
with:

‎.github/workflows/pre-commit.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@ name: pre-commit
33
on:
44
pull_request:
55
push:
6-
branches: [master]
6+
branches:
7+
- master
8+
- 1.3.x
79

810
jobs:
911
pre-commit:
1012
runs-on: ubuntu-latest
13+
concurrency:
14+
group: ${{ github.ref }}-pre-commit
15+
cancel-in-progress: ${{github.event_name == 'pull_request'}}
1116
steps:
1217
- uses: actions/checkout@v2
1318
- uses: actions/setup-python@v2

‎.github/workflows/python-dev.yml

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

0 commit comments

Comments
 (0)