Merge remote-tracking branch 'upstream/master' into weighted-roll-var

Author: ihsansecer

.github/FUNDING.yml

@@ -1 +1,2 @@
 custom: https://pandas.pydata.org/donate.html
+tidelift: pypi/pandas

.github/SECURITY.md

@@ -0,0 +1 @@
+To report a security vulnerability to pandas, please go to https://tidelift.com/security and see the instructions there.

README.md

@@ -233,3 +233,5 @@ You can also triage issues which may include reproducing bug reports, or asking
 Or maybe through using pandas you have an idea of your own or are looking for something in the documentation and thinking ‘this can be improved’...you can do something about it!
 
 Feel free to ask questions on the [mailing list](https://groups.google.com/forum/?fromgroups#!forum/pydata) or on [Gitter](https://gitter.im/pydata/pandas).
+
+As contributors and maintainers to this project, you are expected to abide by pandas' code of conduct. More information can be found at: [Contributor Code of Conduct](https://github.com/pandas-dev/pandas/blob/master/.github/CODE_OF_CONDUCT.md)

ci/deps/azure-37-locale.yaml

@@ -17,7 +17,7 @@ dependencies:
   - openpyxl
   - pytables
   - python-dateutil
-  - python=3.7.*
+  - python=3.7.3
   - pytz
   - s3fs
   - scipy
@@ -26,8 +26,8 @@ dependencies:
   - xlsxwriter
   - xlwt
   # universal
-  - pytest>=4.0.2
-  - pytest-xdist
+  - pytest>=5.0.1
+  - pytest-xdist>=1.29.0
   - pytest-mock
   - pytest-azurepipelines
   - pip

ci/deps/azure-37-numpydev.yaml

@@ -2,11 +2,12 @@ name: pandas-dev
 channels:
   - defaults
 dependencies:
-  - python=3.7.*
+  - python=3.7.3
   - pytz
   - Cython>=0.28.2
   # universal
-  - pytest>=4.0.2
+  # pytest < 5 until defaults has pytest-xdist>=1.29.0
+  - pytest>=4.0.2,<5.0
   - pytest-xdist
   - pytest-mock
   - hypothesis>=3.58.0

ci/deps/azure-macos-35.yaml

@@ -25,8 +25,8 @@ dependencies:
   - pip:
     - pyreadstat
     # universal
-    - pytest==4.5.0
-    - pytest-xdist
+    - pytest>=5.0.1
+    - pytest-xdist>=1.29.0
     - pytest-mock
     - hypothesis>=3.58.0
     # https://github.com/pandas-dev/pandas/issues/27421

ci/deps/azure-windows-36.yaml

@@ -23,8 +23,8 @@ dependencies:
   - xlwt
   # universal
   - cython>=0.28.2
-  - pytest>=4.0.2
-  - pytest-xdist
+  - pytest>=5.0.1
+  - pytest-xdist>=1.29.0
   - pytest-mock
   - pytest-azurepipelines
   - hypothesis>=3.58.0

ci/deps/azure-windows-37.yaml

@@ -26,8 +26,8 @@ dependencies:
   - xlwt
   # universal
   - cython>=0.28.2
-  - pytest>=4.0.2
-  - pytest-xdist
+  - pytest>=5.0.0
+  - pytest-xdist>=1.29.0
   - pytest-mock
   - pytest-azurepipelines
   - hypothesis>=3.58.0

ci/deps/travis-36-cov.yaml

@@ -39,8 +39,8 @@ dependencies:
   - xlsxwriter
   - xlwt
   # universal
-  - pytest
-  - pytest-xdist
+  - pytest>=5.0.1
+  - pytest-xdist>=1.29.0
   - pytest-cov
   - pytest-mock
   - hypothesis>=3.58.0

ci/deps/travis-37.yaml

@@ -4,7 +4,7 @@ channels:
   - conda-forge
   - c3i_test
 dependencies:
-  - python=3.7.*
+  - python=3.7.3
   - botocore>=1.11
   - cython>=0.28.2
   - numpy
@@ -13,8 +13,8 @@ dependencies:
   - pyarrow
   - pytz
   # universal
-  - pytest>=4.0.2
-  - pytest-xdist
+  - pytest>=5.0.0
+  - pytest-xdist>=1.29.0
   - pytest-mock
   - hypothesis>=3.58.0
   - s3fs