Skip to content

Commit 7beb0f9

Browse files
authored
Merge pull request #203 from pandas-dev/master
Sync Fork from Upstream Repo
2 parents 51b9b4f + 21d6145 commit 7beb0f9

File tree

254 files changed

+5625
-2470
lines changed

Some content is hidden

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

254 files changed

+5625
-2470
lines changed

.github/workflows/ci.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ jobs:
2222

2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v1
25+
uses: actions/checkout@v2
26+
with:
27+
fetch-depth: 0
2628

2729
- name: Looking for unwanted patterns
2830
run: ci/code_checks.sh patterns
@@ -94,7 +96,9 @@ jobs:
9496
steps:
9597

9698
- name: Checkout
97-
uses: actions/checkout@v1
99+
uses: actions/checkout@v2
100+
with:
101+
fetch-depth: 0
98102

99103
- name: Set up pandas
100104
uses: ./.github/actions/setup
@@ -147,7 +151,9 @@ jobs:
147151
steps:
148152

149153
- name: Checkout
150-
uses: actions/checkout@v1
154+
uses: actions/checkout@v2
155+
with:
156+
fetch-depth: 0
151157

152158
- name: Set up pandas
153159
uses: ./.github/actions/setup

.github/workflows/database.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,12 @@ jobs:
5656

5757
steps:
5858
- name: Checkout
59-
uses: actions/checkout@v1
59+
uses: actions/checkout@v2
60+
with:
61+
fetch-depth: 0
6062

6163
- name: Cache conda
62-
uses: actions/cache@v1
64+
uses: actions/cache@v2
6365
env:
6466
CACHE_NUMBER: 0
6567
with:

.github/workflows/posix.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,12 @@ jobs:
4444

4545
steps:
4646
- name: Checkout
47-
uses: actions/checkout@v1
47+
uses: actions/checkout@v2
48+
with:
49+
fetch-depth: 0
4850

4951
- name: Cache conda
50-
uses: actions/cache@v1
52+
uses: actions/cache@v2
5153
env:
5254
CACHE_NUMBER: 0
5355
with:

.pre-commit-config.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ repos:
1919
types_or: [python, rst, markdown]
2020
files: ^(pandas|doc)/
2121
- repo: https://github.com/pre-commit/pre-commit-hooks
22-
rev: v3.4.0
22+
rev: v4.0.1
2323
hooks:
2424
- id: debug-statements
2525
- id: end-of-file-fixer
2626
exclude: \.txt$
2727
- id: trailing-whitespace
2828
- repo: https://github.com/cpplint/cpplint
29-
rev: f7061b1 # the latest tag does not have the hook
29+
rev: 1.5.5
3030
hooks:
3131
- id: cpplint
3232
# We don't lint all C files because we don't want to lint any that are built
@@ -57,7 +57,7 @@ repos:
5757
hooks:
5858
- id: isort
5959
- repo: https://github.com/asottile/pyupgrade
60-
rev: v2.12.0
60+
rev: v2.18.3
6161
hooks:
6262
- id: pyupgrade
6363
args: [--py37-plus]
@@ -72,7 +72,7 @@ repos:
7272
types: [text] # overwrite types: [rst]
7373
types_or: [python, rst]
7474
- repo: https://github.com/asottile/yesqa
75-
rev: v1.2.2
75+
rev: v1.2.3
7676
hooks:
7777
- id: yesqa
7878
additional_dependencies:

.travis.yml

-73
This file was deleted.

ci/check_git_tags.sh

-28
This file was deleted.

ci/deps/actions-37-db-min.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66

77
# tools
88
- cython>=0.29.21
9-
- pytest>=5.0.1
9+
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.21
1212
- hypothesis>=3.58.0

ci/deps/actions-37-db.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66

77
# tools
88
- cython>=0.29.21
9-
- pytest>=5.0.1
9+
- pytest>=6.0
1010
- pytest-xdist>=1.21
1111
- hypothesis>=3.58.0
1212
- pytest-cov>=2.10.1 # this is only needed in the coverage build, ref: GH 35737
@@ -25,7 +25,7 @@ dependencies:
2525
- flask
2626
- nomkl
2727
- numexpr
28-
- numpy=1.16.*
28+
- numpy=1.17.*
2929
- odfpy
3030
- openpyxl
3131
- pandas-gbq

ci/deps/actions-37-locale_slow.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77

88
# tools
99
- cython>=0.29.21
10-
- pytest>=5.0.1
10+
- pytest>=6.0
1111
- pytest-cov
1212
- pytest-xdist>=1.21
1313
- hypothesis>=3.58.0
@@ -17,13 +17,13 @@ dependencies:
1717
- bottleneck=1.2.*
1818
- lxml
1919
- matplotlib=3.0.0
20-
- numpy=1.16.*
20+
- numpy=1.17.*
2121
- openpyxl=3.0.0
2222
- python-dateutil
2323
- python-blosc
2424
- pytz=2017.3
2525
- scipy
26-
- sqlalchemy=1.2.8
26+
- sqlalchemy=1.3.0
2727
- xlrd=1.2.0
2828
- xlsxwriter=1.0.2
2929
- xlwt=1.3.0

ci/deps/actions-37-slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77

88
# tools
99
- cython>=0.29.21
10-
- pytest>=5.0.1
10+
- pytest>=6.0
1111
- pytest-cov
1212
- pytest-xdist>=1.21
1313
- hypothesis>=3.58.0

ci/deps/actions-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77

88
# tools
99
- cython>=0.29.21
10-
- pytest>=5.0.1
10+
- pytest>=6.0
1111
- pytest-cov
1212
- pytest-xdist>=1.21
1313
- hypothesis>=3.58.0

ci/deps/actions-38-locale.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66

77
# tools
88
- cython>=0.29.21
9-
- pytest>=5.0.1
9+
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.21
1212
- pytest-asyncio>=0.12.0
@@ -20,7 +20,7 @@ dependencies:
2020
- jinja2
2121
- jedi<0.18.0
2222
- lxml
23-
- matplotlib <3.3.0
23+
- matplotlib<3.3.0
2424
- moto
2525
- nomkl
2626
- numexpr

ci/deps/actions-38-numpydev.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ dependencies:
55
- python=3.8.*
66

77
# tools
8-
- pytest>=5.0.1
8+
- pytest>=6.0
99
- pytest-cov
1010
- pytest-xdist>=1.21
1111
- hypothesis>=3.58.0
1212

1313
# pandas dependencies
1414
- pytz
15-
- pip=20.2
15+
- pip
1616
- pip:
1717
- cython==0.29.21 # GH#34014
1818
- "git+git://github.com/dateutil/dateutil.git"

ci/deps/actions-38-slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66

77
# tools
88
- cython>=0.29.21
9-
- pytest>=5.0.1
9+
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.21
1212
- hypothesis>=3.58.0

ci/deps/actions-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77

88
# tools
99
- cython>=0.29.21
10-
- pytest>=5.0.1
10+
- pytest>=6.0
1111
- pytest-cov
1212
- pytest-xdist>=1.21
1313
- hypothesis>=3.58.0

ci/deps/actions-39.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66

77
# tools
88
- cython>=0.29.21
9-
- pytest>=5.0.1
9+
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.21
1212
- hypothesis>=3.58.0

ci/deps/azure-macos-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- python=3.7.*
77

88
# tools
9-
- pytest>=5.0.1
9+
- pytest>=6.0
1010
- pytest-xdist>=1.21
1111
- hypothesis>=3.58.0
1212
- pytest-azurepipelines

ci/deps/azure-windows-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77

88
# tools
99
- cython>=0.29.21
10-
- pytest>=5.0.1
10+
- pytest>=6.0
1111
- pytest-xdist>=1.21
1212
- hypothesis>=3.58.0
1313
- pytest-azurepipelines

ci/deps/azure-windows-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77

88
# tools
99
- cython>=0.29.21
10-
- pytest>=5.0.1
10+
- pytest>=6.0
1111
- pytest-xdist>=1.21
1212
- hypothesis>=3.58.0
1313
- pytest-azurepipelines

ci/deps/travis-37-arm64.yaml renamed to ci/deps/circle-37-arm64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66

77
# tools
88
- cython>=0.29.21
9-
- pytest>=5.0.1
9+
- pytest>=6.0
1010
- pytest-xdist>=1.21
1111
- hypothesis>=3.58.0
1212

0 commit comments

Comments
 (0)