Merge branch 'master' of https://github.com/pandas-dev/pandas into cln-pytables8

Author: jbrockmendel

ci/code_checks.sh

@@ -194,6 +194,10 @@ if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then
     invgrep -R --include="*.py" --include="*.pyx" -E 'class.*:\n\n( )+"""' .
     RET=$(($RET + $?)) ; echo $MSG "DONE"
 
+    MSG='Check for use of comment-based annotation syntax' ; echo $MSG
+    invgrep -R --include="*.py" -P '# type: (?!ignore)' pandas
+    RET=$(($RET + $?)) ; echo $MSG "DONE"
+
     MSG='Check that no file in the repo contains trailing whitespaces' ; echo $MSG
     set -o pipefail
     if [[ "$AZURE" == "true" ]]; then

ci/deps/azure-36-32bit.yaml

@@ -8,7 +8,6 @@ dependencies:
   # tools
   ### Cython 0.29.13 and pytest 5.0.1 for 32 bits are not available with conda, installing below with pip instead
   - pytest-xdist>=1.21
-  - pytest-mock
   - hypothesis>=3.58.0
   - pytest-azurepipelines
 

ci/deps/azure-36-locale.yaml

@@ -9,7 +9,6 @@ dependencies:
   - cython>=0.29.13
   - pytest>=5.0.1
   - pytest-xdist>=1.21
-  - pytest-mock
   - hypothesis>=3.58.0
   - pytest-azurepipelines
 

ci/deps/azure-36-locale_slow.yaml

@@ -9,7 +9,6 @@ dependencies:
   - cython>=0.29.13
   - pytest>=5.0.1
   - pytest-xdist>=1.21
-  - pytest-mock
   - hypothesis>=3.58.0
   - pytest-azurepipelines
 

ci/deps/azure-36-minimum_versions.yaml

@@ -9,7 +9,6 @@ dependencies:
   - cython=0.29.13
   - pytest=5.0.1
   - pytest-xdist>=1.21
-  - pytest-mock
   - hypothesis>=3.58.0
   - pytest-azurepipelines
 

ci/deps/azure-37-locale.yaml

@@ -9,7 +9,6 @@ dependencies:
   - cython>=0.29.13
   - pytest>=5.0.1
   - pytest-xdist>=1.21
-  - pytest-mock
   - hypothesis>=3.58.0
   - pytest-azurepipelines
 

ci/deps/azure-37-numpydev.yaml

@@ -8,7 +8,6 @@ dependencies:
   - cython>=0.29.13
   - pytest>=5.0.1
   - pytest-xdist>=1.21
-  - pytest-mock
   - hypothesis>=3.58.0
   - pytest-azurepipelines
 

ci/deps/azure-macos-36.yaml

@@ -8,7 +8,6 @@ dependencies:
   - cython>=0.29.13
   - pytest>=5.0.1
   - pytest-xdist>=1.21
-  - pytest-mock
   - hypothesis>=3.58.0
   - pytest-azurepipelines
 

ci/deps/azure-windows-36.yaml

@@ -9,7 +9,6 @@ dependencies:
   - cython>=0.29.13
   - pytest>=5.0.1
   - pytest-xdist>=1.21
-  - pytest-mock
   - hypothesis>=3.58.0
   - pytest-azurepipelines
 

ci/deps/azure-windows-37.yaml

@@ -9,7 +9,6 @@ dependencies:
   - cython>=0.29.13
   - pytest>=5.0.1
   - pytest-xdist>=1.21
-  - pytest-mock
   - hypothesis>=3.58.0
   - pytest-azurepipelines