Merge remote-tracking branch 'upstream/master' into bisect

Author: simonjayhawkins

.pre-commit-config.yaml

@@ -19,14 +19,14 @@ repos:
         types_or: [python, rst, markdown]
         files: ^(pandas|doc)/
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.0.1
     hooks:
     -   id: debug-statements
     -   id: end-of-file-fixer
         exclude: \.txt$
     -   id: trailing-whitespace
 -   repo: https://github.com/cpplint/cpplint
-    rev: f7061b1 # the latest tag does not have the hook
+    rev: 1.5.5
     hooks:
     -   id: cpplint
         # We don't lint all C files because we don't want to lint any that are built
@@ -57,7 +57,7 @@ repos:
     hooks:
     -   id: isort
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.12.0
+    rev: v2.18.3
     hooks:
     -   id: pyupgrade
         args: [--py37-plus]
@@ -72,7 +72,7 @@ repos:
         types: [text]  # overwrite types: [rst]
         types_or: [python, rst]
 -   repo: https://github.com/asottile/yesqa
-    rev: v1.2.2
+    rev: v1.2.3
     hooks:
     -   id: yesqa
         additional_dependencies:

.travis.yml

@@ -6,7 +6,7 @@ dependencies:
 
   # tools
   - cython>=0.29.21
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-cov
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0

ci/check_git_tags.sh

@@ -6,7 +6,7 @@ dependencies:
 
   # tools
   - cython>=0.29.21
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
   - pytest-cov>=2.10.1  # this is only needed in the coverage build, ref: GH 35737
@@ -25,7 +25,7 @@ dependencies:
   - flask
   - nomkl
   - numexpr
-  - numpy=1.16.*
+  - numpy=1.17.*
   - odfpy
   - openpyxl
   - pandas-gbq

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

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.21
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-cov
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
@@ -17,13 +17,13 @@ dependencies:
   - bottleneck=1.2.*
   - lxml
   - matplotlib=3.0.0
-  - numpy=1.16.*
+  - numpy=1.17.*
   - openpyxl=3.0.0
   - python-dateutil
   - python-blosc
   - pytz=2017.3
   - scipy
-  - sqlalchemy=1.2.8
+  - sqlalchemy=1.3.0
   - xlrd=1.2.0
   - xlsxwriter=1.0.2
   - xlwt=1.3.0

ci/deps/actions-37-db.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.21
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-cov
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0

ci/deps/actions-37-locale_slow.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.21
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-cov
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0

ci/deps/actions-37-slow.yaml

@@ -6,7 +6,7 @@ dependencies:
 
   # tools
   - cython>=0.29.21
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-cov
   - pytest-xdist>=1.21
   - pytest-asyncio>=0.12.0
@@ -20,7 +20,7 @@ dependencies:
   - jinja2
   - jedi<0.18.0
   - lxml
-  - matplotlib <3.3.0
+  - matplotlib<3.3.0
   - moto
   - nomkl
   - numexpr

ci/deps/actions-37.yaml

@@ -5,14 +5,14 @@ dependencies:
   - python=3.8.*
 
   # tools
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-cov
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
 
   # pandas dependencies
   - pytz
-  - pip=20.2
+  - pip
   - pip:
     - cython==0.29.21 # GH#34014
     - "git+git://github.com/dateutil/dateutil.git"

ci/deps/actions-38-locale.yaml

@@ -6,7 +6,7 @@ dependencies:
 
   # tools
   - cython>=0.29.21
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-cov
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0

ci/deps/actions-38-numpydev.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.21
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-cov
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0

ci/deps/actions-38-slow.yaml

@@ -6,7 +6,7 @@ dependencies:
 
   # tools
   - cython>=0.29.21
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-cov
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0

ci/deps/actions-38.yaml

@@ -6,7 +6,7 @@ dependencies:
   - python=3.7.*
 
   # tools
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
   - pytest-azurepipelines

ci/deps/actions-39.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.21
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
   - pytest-azurepipelines

ci/deps/azure-macos-37.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.21
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
   - pytest-azurepipelines

ci/deps/azure-windows-37.yaml

@@ -6,7 +6,7 @@ dependencies:
 
   # tools
   - cython>=0.29.21
-  - pytest>=5.0.1
+  - pytest>=6.0
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0