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

Author: jbrockmendel

.pre-commit-config.yaml

@@ -46,6 +46,14 @@ repos:
  files: ^(environment.yml|requirements-dev.txt)$
  pass_filenames: false
  additional_dependencies: [pyyaml]
+ - id: flake8-rst
+ name: flake8-rst
+ description: Run flake8 on code snippets in docstrings or RST files
+ language: python
+ entry: flake8-rst
+ types: [rst]
+ args: [--filename=*.rst]
+ additional_dependencies: [flake8-rst==0.7.0, flake8==3.7.9]
 - repo: https://github.com/asottile/yesqa
  rev: v1.2.2
  hooks:

ci/code_checks.sh

@@ -73,13 +73,6 @@ if [[ -z "$CHECK" || "$CHECK" == "lint" ]]; then
  flake8 --format="$FLAKE8_FORMAT" pandas/_libs --append-config=flake8/cython-template.cfg
  RET=$(($RET + $?)) ; echo $MSG "DONE"
 
- echo "flake8-rst --version"
- flake8-rst --version
-
- MSG='Linting code-blocks in .rst documentation' ; echo $MSG
- flake8-rst doc/source --filename=*.rst --format="$FLAKE8_FORMAT"
- RET=$(($RET + $?)) ; echo $MSG "DONE"
-
  # Check that cython casting is of the form `<type>obj` as opposed to `<type> obj`;
  # it doesn't make a difference, but we want to be internally consistent.
  # Note: this grep pattern is (intended to be) equivalent to the python