Merge pull request #130 from blairconrad/pylama

Switch from pyflakes to pylama

.vscode/settings.json

@@ -1,11 +1,12 @@
 {
     "python.formatting.provider": "black",
-    "python.linting.flake8Enabled": true,
     "python.linting.enabled": true,
-    "python.testing.pytestArgs": [],
-    "python.testing.unittestEnabled": false,
+    "python.linting.flake8Enabled": false,
+    "python.linting.pylamaEnabled": true,
     "python.testing.nosetestsEnabled": false,
+    "python.testing.pytestArgs": [],
     "python.testing.pytestEnabled": true,
+    "python.testing.unittestEnabled": false,
     "cSpell.words": [
         "Anonymizer",
         "DICOGNITO",

CONTRIBUTING.md

@@ -22,8 +22,8 @@ updated tests.
 
 ## Style
 
-We use [flake8](http://flake8.pycqa.org/en/latest/) as a linter and [black](https://black.readthedocs.io/en/stable/)
-as a formatter. Please follow existing conventions. Any deviations will cause the tests to fail.
+We use [pylama](https://github.com/klen/pylama/) as a linter and [black](https://black.readthedocs.io/en/stable/)
+as a formatter. Please follow existing conventions. Any deviations will cause the build to fail.
 
 ## Making Changes
 

pyproject.toml

@@ -14,13 +14,40 @@ exclude = '''
   )/
 )
 '''
+[tool.pylama.linter.mypy]
+show_error_codes=true
+show_error_context=true
+show_column_numbers=true
+pretty=true
+color_output=true
+
+warn_unreachable=true
+allow_redefinition=false
+
+# treat Optional per PEP 484
+strict_optional=true
+
+strict=true
+
+[tool.pylama]
+linters = "mccabe,mypy,pycodestyle,pyflakes"
+skip = ".tox/*"
+
+[[tool.pylama.linter.mypy.overrides]]
+module="pydicom.*"
+ignore_missing_imports = true
+
+[[tool.pylama.linter.mypy.overrides]]
+module="pytest."
+ignore_missing_imports = true
+
+[[tool.pylama.linter.mypy.overrides]]
+module="tests.*"
+allow_untyped_defs = true
+
+[tool.pylama.linter.pycodestyle]
+ignore = "E203,W503"
+max_line_length = 120
 
 [tool.pytest.ini_options]
 xfail_strict=true
-filterwarnings = [
-    "error",
-    "ignore:SelectableGroups:DeprecationWarning",
-    "ignore:<class '.*'> is not using a cooperative constructor:pytest.PytestDeprecationWarning",
-    "ignore:The \\(fspath. py.path.local\\) argument to .* is deprecated.:pytest.PytestDeprecationWarning",
-    "ignore:.* is an Item subclass and should not be a collector.*:pytest.PytestWarning",
-]

src/dicognito/__main__.py

@@ -17,7 +17,7 @@
 from dicognito.summary import Summary
 
 
-def main(main_args: Optional[Sequence[str]] = None) -> None:
+def main(main_args: Optional[Sequence[str]] = None) -> None:  # noqa: C901
     class VersionAction(argparse.Action):
         def __init__(
             self,

tasks.py

@@ -12,7 +12,7 @@ def add_source_to_sys_path():
 def test(context, like, loop=False):
     add_source_to_sys_path()
 
-    args = ["pytest", "--flake8", "--black"]
+    args = ["pytest"]
     if like:
         args += ["-k", " or ".join(like)]
     if loop:

tox.ini

@@ -4,14 +4,13 @@ envlist = py37,py38,py39,py310
 [testenv]
 # install pytest in the virtualenv where commands will be executed
 deps =
-    pytest >= 7.0.1
-    pytest-black
+    black
     pydicom>=2.1.1
-    flake8<5
-    pep8-naming
-    pytest-flake8
-    mypy
+    pylama[mccabe,mypy,pycodestyle,pyflakes,toml]
+    pytest >= 7.0.1
+
 commands =
     # NOTE: you can run any command line tool here - not just tests
-    pytest --flake8 --black {posargs}
-    mypy src tests
+    black --check --diff --quiet .
+    pylama src tests
+    pytest {posargs}