Skip to content

Commit 1860a18

Browse files
committed
Merge branch 'master' of https://github.com/pandas-dev/pandas into cln-arith
2 parents 75fae8d + 4a6c3c5 commit 1860a18

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1029
-771
lines changed

.pre-commit-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ repos:
4646
files: ^(environment.yml|requirements-dev.txt)$
4747
pass_filenames: false
4848
additional_dependencies: [pyyaml]
49+
- id: flake8-rst
50+
name: flake8-rst
51+
description: Run flake8 on code snippets in docstrings or RST files
52+
language: python
53+
entry: flake8-rst
54+
types: [rst]
55+
args: [--filename=*.rst]
56+
additional_dependencies: [flake8-rst==0.7.0, flake8==3.7.9]
4957
- repo: https://github.com/asottile/yesqa
5058
rev: v1.2.2
5159
hooks:

ci/code_checks.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,6 @@ if [[ -z "$CHECK" || "$CHECK" == "lint" ]]; then
7373
flake8 --format="$FLAKE8_FORMAT" pandas/_libs --append-config=flake8/cython-template.cfg
7474
RET=$(($RET + $?)) ; echo $MSG "DONE"
7575

76-
echo "flake8-rst --version"
77-
flake8-rst --version
78-
79-
MSG='Linting code-blocks in .rst documentation' ; echo $MSG
80-
flake8-rst doc/source --filename=*.rst --format="$FLAKE8_FORMAT"
81-
RET=$(($RET + $?)) ; echo $MSG "DONE"
82-
8376
# Check that cython casting is of the form `<type>obj` as opposed to `<type> obj`;
8477
# it doesn't make a difference, but we want to be internally consistent.
8578
# Note: this grep pattern is (intended to be) equivalent to the python

0 commit comments

Comments
 (0)