Skip to content

Commit f6595be

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 8b6942f + 35821a5 commit f6595be

39 files changed

+220
-97
lines changed

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
custom: https://pandas.pydata.org/donate.html
2+
tidelift: pypi/pandas

.github/SECURITY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
To report a security vulnerability to pandas, please go to https://tidelift.com/security and see the instructions there.

ci/deps/azure-37-locale.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
- openpyxl
1818
- pytables
1919
- python-dateutil
20-
- python=3.7.*
20+
- python=3.7.3
2121
- pytz
2222
- s3fs
2323
- scipy
@@ -26,8 +26,8 @@ dependencies:
2626
- xlsxwriter
2727
- xlwt
2828
# universal
29-
- pytest>=4.0.2
30-
- pytest-xdist
29+
- pytest>=5.0.1
30+
- pytest-xdist>=1.29.0
3131
- pytest-mock
3232
- pytest-azurepipelines
3333
- pip

ci/deps/azure-37-numpydev.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ name: pandas-dev
22
channels:
33
- defaults
44
dependencies:
5-
- python=3.7.*
5+
- python=3.7.3
66
- pytz
77
- Cython>=0.28.2
88
# universal
9-
- pytest>=4.0.2
9+
# pytest < 5 until defaults has pytest-xdist>=1.29.0
10+
- pytest>=4.0.2,<5.0
1011
- pytest-xdist
1112
- pytest-mock
1213
- hypothesis>=3.58.0

ci/deps/azure-macos-35.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ dependencies:
2525
- pip:
2626
- pyreadstat
2727
# universal
28-
- pytest==4.5.0
29-
- pytest-xdist
28+
- pytest>=5.0.1
29+
- pytest-xdist>=1.29.0
3030
- pytest-mock
3131
- hypothesis>=3.58.0
3232
# https://github.com/pandas-dev/pandas/issues/27421

ci/deps/azure-windows-36.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ dependencies:
2323
- xlwt
2424
# universal
2525
- cython>=0.28.2
26-
- pytest>=4.0.2
27-
- pytest-xdist
26+
- pytest>=5.0.1
27+
- pytest-xdist>=1.29.0
2828
- pytest-mock
2929
- pytest-azurepipelines
3030
- hypothesis>=3.58.0

ci/deps/azure-windows-37.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ dependencies:
2626
- xlwt
2727
# universal
2828
- cython>=0.28.2
29-
- pytest>=4.0.2
30-
- pytest-xdist
29+
- pytest>=5.0.0
30+
- pytest-xdist>=1.29.0
3131
- pytest-mock
3232
- pytest-azurepipelines
3333
- hypothesis>=3.58.0

ci/deps/travis-36-cov.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ dependencies:
3939
- xlsxwriter
4040
- xlwt
4141
# universal
42-
- pytest
43-
- pytest-xdist
42+
- pytest>=5.0.1
43+
- pytest-xdist>=1.29.0
4444
- pytest-cov
4545
- pytest-mock
4646
- hypothesis>=3.58.0

ci/deps/travis-37.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
- conda-forge
55
- c3i_test
66
dependencies:
7-
- python=3.7.*
7+
- python=3.7.3
88
- botocore>=1.11
99
- cython>=0.28.2
1010
- numpy
@@ -13,8 +13,8 @@ dependencies:
1313
- pyarrow
1414
- pytz
1515
# universal
16-
- pytest>=4.0.2
17-
- pytest-xdist
16+
- pytest>=5.0.0
17+
- pytest-xdist>=1.29.0
1818
- pytest-mock
1919
- hypothesis>=3.58.0
2020
- s3fs

doc/source/reference/extensions.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ objects.
4444
api.extensions.ExtensionArray.argsort
4545
api.extensions.ExtensionArray.astype
4646
api.extensions.ExtensionArray.copy
47+
api.extensions.ExtensionArray.view
4748
api.extensions.ExtensionArray.dropna
4849
api.extensions.ExtensionArray.factorize
4950
api.extensions.ExtensionArray.fillna

0 commit comments

Comments
 (0)