Commitd8bcb80

committed

improve compatibility of flake8 with black

1 parentb4b2380 commitd8bcb80Copy full SHA for d8bcb80

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,14 @@ ignore = E265,E266,E731,E704,`
`25`	`25`	`A,`
`26`	`26`	`D,`
`27`	`27`	`RST, RST3`
`28`		`-max-line-length = 120`
`29`	`28`
`30`	`29`	`exclude = .tox,.venv,build,dist,doc,git/ext/,test`
`31`	`30`
`32`	`31`	`rst-roles =# for flake8-RST-docstrings`
`33`	`32`	`attr,class,func,meth,mod,obj,ref,term,var# used by sphinx`
`34`	`33`
`35`	`34`	`min-python-version = 3.7.0`
	`35`	`+`
	`36`	+# for `black` compatibility
	`37`	`+max-line-length = 88`
	`38`	`+extend-ignore = E203`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,11 @@ jobs:`
`44`	`44`	`# and cause subsequent tests to fail`
`45`	`45`	`cat test/fixtures/.gitconfig >> ~/.gitconfig`
`46`	`46`
	`47`	`+ -name:Lint with black`
	`48`	`+run:\|`
	`49`	`+ set -x`
	`50`	`+ black --check .`
	`51`	`+`
`47`	`52`	`-name:Lint with flake8`
`48`	`53`	`run:\|`
`49`	`54`	`set -x`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,8 @@`
`4`	`4`	`# libraries for additional local testing/linting - to be added to test-requirements.txt when all pass`
`5`	`5`
`6`	`6`	`flake8-type-checking;python_version>="3.8"# checks for TYPE_CHECKING only imports`
`7`		`-# flake8-annotations # checks for presence of type annotations`
`8`		`-# flake8-rst-docstrings # checks docstrings are valid RST`
`9`		`-# flake8-builtins # warns about shadowing builtin names`
`10`		`-# flake8-pytest-style`
	`7`	`+black`
`11`	`8`
`12`		`-# pytest-flake8`
`13`	`9`	`pytest-icdiff`
`14`	`10`	`# pytest-profiling`
`15`	`11`

Lines changed: 2 additions & 0 deletions

Comments

(0)