Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
repos:
- repo: https://github.com/psf/black
rev: 19.10b0
- repo: https://github.com/psf/black
rev: 20.8b1 # also bump this in Pipfile
hooks:
- id: black
- id: black
args: [--safe, --quiet]
- repo: https://github.com/asottile/blacken-docs
- repo: https://github.com/asottile/blacken-docs
rev: v1.7.0
hooks:
- id: blacken-docs
additional_dependencies: [black==19.10b0]
- repo: https://github.com/pre-commit/pre-commit-hooks
- id: blacken-docs
additional_dependencies: [black==20.8b1] # also bump this in Pipfile
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.1.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: fix-encoding-pragma
- id: trailing-whitespace
- id: end-of-file-fixer
- id: fix-encoding-pragma
args: [--remove]
- id: check-yaml
- id: debug-statements
- id: check-yaml
- id: debug-statements
language_version: python3
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.2
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.4 # also bump this in Pipfile
hooks:
- id: flake8
- id: flake8
language_version: python3
additional_dependencies:
- flake8-builtins==1.5.3
- flake8-typing-imports==1.9.0
- repo: https://github.com/asottile/reorder_python_imports
- flake8-builtins==1.5.3
- flake8-typing-imports==1.9.0
- repo: https://github.com/asottile/reorder_python_imports
rev: v2.3.0
hooks:
- id: reorder-python-imports
args: ['--application-directories=.:src:testing', --py3-plus]
- repo: https://github.com/asottile/pyupgrade
- id: reorder-python-imports
args: ["--application-directories=.:src:testing", --py3-plus]
- repo: https://github.com/asottile/pyupgrade
rev: v2.4.4
hooks:
- id: pyupgrade
- id: pyupgrade
args: [--py3-plus]
- repo: https://github.com/pre-commit/mirrors-eslint
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v7.13.0
hooks:
- id: eslint
- id: eslint
additional_dependencies:
- eslint@7.13.0
- eslint@7.13.0
args: [src]
- repo: local
- repo: local
hooks:
- id: rst
- id: rst
name: rst
entry: rst-lint --encoding utf-8
files: ^(CHANGES.rst|development.rst|README.rst)$
language: python
additional_dependencies: [pygments, restructuredtext_lint]
- repo: https://github.com/elidupuis/mirrors-sass-lint
rev: '5cc45653263b423398e4af2561fae362903dd45d'
- repo: https://github.com/elidupuis/mirrors-sass-lint
rev: "5cc45653263b423398e4af2561fae362903dd45d"
hooks:
- id: sass-lint
- id: sass-lint
4 changes: 2 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ verify_ssl = true
[dev-packages]
pytest = "*"
tox = "*"
flake8 = "*"
black = "*"
flake8 = "==3.8.4" # also bump this in .pre-commit-config.yaml
black = "==20.8b1" # also bump this in .pre-commit-config.yaml
pre-commit = "*"

[packages]
Expand Down
3 changes: 2 additions & 1 deletion testing/test_pytest_html.py
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,8 @@ def test_foo(val):
assert_results(html, passed=1)

@pytest.mark.parametrize(
"with_ansi", [True, False],
"with_ansi",
[True, False],
)
def test_ansi_color(self, testdir, mocker, with_ansi):
if not with_ansi:
Expand Down