Skip to content

Commit

Permalink
resolve conflicts on PR for issue jendrikseipp#227
Browse files Browse the repository at this point in the history
  • Loading branch information
mcooperman committed Sep 12, 2020
1 parent 891795c commit e2f7b56
Show file tree
Hide file tree
Showing 5 changed files with 128 additions and 113 deletions.
6 changes: 6 additions & 0 deletions tests/test_utils.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
"""module: test-utils"""

# standard imports
import ast
import pathlib

# external imports

# local imports
from vulture import utils


Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@ deps =
flake8-2020
flake8-bugbear
flake8-comprehensions
flake8_formatter_abspath
pyupgrade
whitelist_externals =
bash
commands =
black --check --diff .
flake8 setup.py tests/ vulture/
flake8 --format=abspath setup.py tests/ vulture/
bash -c "pyupgrade --py36-plus `find dev/ tests/ vulture/ -name '*.py'` setup.py"

[testenv:fix-style]
Expand Down
2 changes: 2 additions & 0 deletions vulture/__main__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
"""module: __main__"""

from vulture.core import main

main()
Loading

0 comments on commit e2f7b56

Please sign in to comment.