Skip to content

Commit 28c17c7

Browse files
calvhcalvh
committed
Update to pass CI checks
Merge branch 'master' into 41457-upgrade-to-bootstrap5
2 parents 917ff6c + dad3e7f commit 28c17c7

File tree

409 files changed

+8432
-5568
lines changed

Some content is hidden

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

409 files changed

+8432
-5568
lines changed

‎.github/workflows/ci.yml

+16-3
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
67
pull_request:
78
branches:
89
- master
910
- 1.2.x
11+
- 1.3.x
1012

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

25+
concurrency:
26+
group: ${{ github.ref }}-checks
27+
cancel-in-progress: true
28+
2329
steps:
2430
- name: Checkout
2531
uses: actions/checkout@v2
@@ -93,8 +99,12 @@ jobs:
9399
web_and_docs:
94100
name: Web and docs
95101
runs-on: ubuntu-latest
96-
steps:
97102

103+
concurrency:
104+
group: ${{ github.ref }}-web-docs
105+
cancel-in-progress: true
106+
107+
steps:
98108
- name: Checkout
99109
uses: actions/checkout@v2
100110
with:
@@ -148,8 +158,11 @@ jobs:
148158
strategy:
149159
matrix:
150160
pattern: ["not slow and not network and not clipboard", "slow"]
151-
steps:
161+
concurrency:
162+
group: ${{ github.ref }}-data_manager-${{ matrix.pattern }}
163+
cancel-in-progress: true
152164

165+
steps:
153166
- name: Checkout
154167
uses: actions/checkout@v2
155168
with:

‎.github/workflows/database.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ name: Database
22

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

1115
env:
1216
PYTEST_WORKERS: "auto"
@@ -15,17 +19,21 @@ env:
1519
COVERAGE: true
1620

1721
jobs:
18-
Linux_py37_IO:
22+
Linux_py38_IO:
1923
runs-on: ubuntu-latest
2024
defaults:
2125
run:
2226
shell: bash -l {0}
2327

2428
strategy:
2529
matrix:
26-
ENV_FILE: [ci/deps/actions-37-db-min.yaml, ci/deps/actions-37-db.yaml]
30+
ENV_FILE: [ci/deps/actions-38-db-min.yaml, ci/deps/actions-38-db.yaml]
2731
fail-fast: false
2832

33+
concurrency:
34+
group: ${{ github.ref }}-${{ matrix.ENV_FILE }}
35+
cancel-in-progress: true
36+
2937
services:
3038
mysql:
3139
image: mysql

‎.github/workflows/posix.yml

+12-6
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
67
pull_request:
78
branches:
89
- master
910
- 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,6 +44,9 @@ 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: true
4450

4551
steps:
4652
- name: Checkout

‎.github/workflows/pre-commit.yml

+5-1
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

+15-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,25 @@ on:
77
pull_request:
88
branches:
99
- master
10+
paths-ignore:
11+
- "doc/**"
12+
13+
env:
14+
PYTEST_WORKERS: "auto"
15+
PANDAS_CI: 1
16+
PATTERN: "not slow and not network and not clipboard"
17+
COVERAGE: true
1018

1119
jobs:
1220
build:
1321
runs-on: ubuntu-latest
1422
name: actions-310-dev
1523
timeout-minutes: 60
1624

25+
concurrency:
26+
group: ${{ github.ref }}-dev
27+
cancel-in-progress: true
28+
1729
steps:
1830
- uses: actions/checkout@v2
1931
with:
@@ -30,7 +42,7 @@ jobs:
3042
pip install git+https://github.com/numpy/numpy.git
3143
pip install git+https://github.com/pytest-dev/pytest.git
3244
pip install git+https://github.com/nedbat/coveragepy.git
33-
pip install cython python-dateutil pytz hypothesis pytest-xdist
45+
pip install cython python-dateutil pytz hypothesis pytest-xdist pytest-cov
3446
pip list
3547
3648
- name: Build Pandas
@@ -44,7 +56,8 @@ jobs:
4456
4557
- name: Test with pytest
4658
run: |
47-
coverage run -m pytest -m 'not slow and not network and not clipboard' pandas
59+
ci/run_tests.sh
60+
# GH 41935
4861
continue-on-error: true
4962

5063
- name: Publish test results

‎.github/workflows/sdist.yml

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

‎.pre-commit-config.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ repos:
99
- id: absolufy-imports
1010
files: ^pandas/
1111
- repo: https://github.com/python/black
12-
rev: 20.8b1
12+
rev: 21.6b0
1313
hooks:
1414
- id: black
1515
- repo: https://github.com/codespell-project/codespell
16-
rev: v2.0.0
16+
rev: v2.1.0
1717
hooks:
1818
- id: codespell
1919
types_or: [python, rst, markdown]
@@ -53,16 +53,16 @@ repos:
5353
types: [text]
5454
args: [--append-config=flake8/cython-template.cfg]
5555
- repo: https://github.com/PyCQA/isort
56-
rev: 5.8.0
56+
rev: 5.9.1
5757
hooks:
5858
- id: isort
5959
- repo: https://github.com/asottile/pyupgrade
60-
rev: v2.18.3
60+
rev: v2.20.0
6161
hooks:
6262
- id: pyupgrade
6363
args: [--py37-plus]
6464
- repo: https://github.com/pre-commit/pygrep-hooks
65-
rev: v1.8.0
65+
rev: v1.9.0
6666
hooks:
6767
- id: rst-backticks
6868
- id: rst-directive-colons

‎MANIFEST.in

+13-2
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,19 @@ global-exclude *.h5
1717
global-exclude *.html
1818
global-exclude *.json
1919
global-exclude *.jsonl
20+
global-exclude *.msgpack
2021
global-exclude *.pdf
2122
global-exclude *.pickle
2223
global-exclude *.png
2324
global-exclude *.pptx
24-
global-exclude *.pyc
25-
global-exclude *.pyd
2625
global-exclude *.ods
2726
global-exclude *.odt
27+
global-exclude *.orc
2828
global-exclude *.sas7bdat
2929
global-exclude *.sav
3030
global-exclude *.so
3131
global-exclude *.xls
32+
global-exclude *.xlsb
3233
global-exclude *.xlsm
3334
global-exclude *.xlsx
3435
global-exclude *.xpt
@@ -39,6 +40,13 @@ global-exclude .DS_Store
3940
global-exclude .git*
4041
global-exclude \#*
4142

43+
global-exclude *.c
44+
global-exclude *.cpp
45+
global-exclude *.h
46+
47+
global-exclude *.py[ocd]
48+
global-exclude *.pxi
49+
4250
# GH 39321
4351
# csv_dir_path fixture checks the existence of the directory
4452
# exclude the whole directory to avoid running related tests in sdist
@@ -47,3 +55,6 @@ prune pandas/tests/io/parser/data
4755
include versioneer.py
4856
include pandas/_version.py
4957
include pandas/io/formats/templates/*.tpl
58+
59+
graft pandas/_libs/src
60+
graft pandas/_libs/tslibs/src

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3509134.svg)](https://doi.org/10.5281/zenodo.3509134)
1111
[![Package Status](https://img.shields.io/pypi/status/pandas.svg)](https://pypi.org/project/pandas/)
1212
[![License](https://img.shields.io/pypi/l/pandas.svg)](https://github.com/pandas-dev/pandas/blob/master/LICENSE)
13-
[![Travis Build Status](https://travis-ci.org/pandas-dev/pandas.svg?branch=master)](https://travis-ci.org/pandas-dev/pandas)
1413
[![Azure Build Status](https://dev.azure.com/pandas-dev/pandas/_apis/build/status/pandas-dev.pandas?branch=master)](https://dev.azure.com/pandas-dev/pandas/_build/latest?definitionId=1&branch=master)
1514
[![Coverage](https://codecov.io/github/pandas-dev/pandas/coverage.svg?branch=master)](https://codecov.io/gh/pandas-dev/pandas)
1615
[![Downloads](https://anaconda.org/conda-forge/pandas/badges/downloads.svg)](https://pandas.pydata.org)

0 commit comments

Comments
 (0)