Prune dependencies (#46)

* ♻️ - Refactor

* 🔖 - Bump up version to 1.1.0

Author: Isac Byeonghoon Yoo

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "buzzvil-python-styleguide"
-version = "1.0.2"
+version = "1.1.0"
 description = "Buzzvil's shared style preset"
 authors = ["Isac Byeonghoon Yoo <[email protected]>"]
 maintainers = ["Isac Byeonghoon Yoo <[email protected]>"]
@@ -17,41 +17,42 @@ classifiers = [
     "Framework :: Flake8",
     "Intended Audience :: Developers",
     "Natural Language :: English",
-    "Programming Language :: Python :: 2",
-    "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Quality Assurance",
 ]
 
 
 [tool.poetry.dependencies]
 python = "^3.6.2"
-flake8 = ">=3.5"
 black = "^21.9b0"
-flake8-builtins = "^1.5.3"
-mypy = ">=0.910"
+django-stubs = { version = "^1.9.0", optional = true }
+flake8 = ">=3.8"
+flake8-annotations-complexity = "^0.0.6"
+flake8-bandit = "^2.1.2"
+flake8-black = "^0.2.3"
+flake8-breakpoint = "^1.1.0"
 flake8-bugbear = "^21.9.2"
+flake8-builtins = "^1.5.3"
 flake8-comprehensions = "^3.7.0"
 flake8-django = { version = "^1.1.2", optional = true }
-flake8-eradicate = "^1.1.0"
-flake8-mutable = "^1.2.0"
-flake8-pytest-style = "^1.5.0"
-pep8-naming = "^0.12.1"
+flake8-eradicate = "^1.2.0"
+flake8-force-keyword-arguments = "^1.0.0"
 flake8-functions = "^0.0.6"
-flake8-annotations-complexity = "^0.0.6"
-dlint = "^0.11.0"
-django-stubs = { version = "^1.9.0", optional = true }
-flake8-black = "^0.2.3"
-flake8-blind-except = "^0.2.0"
 flake8-future-import = "^0.4.6"
+flake8-logging-format = "^0.6.0"
+flake8-print = "^4.0.0"
+flake8-pytest-style = "^1.5.0"
+flake8-return = "^1.1.3"
+importlib-metadata = {version = "*", python = "<3.8"}
+mypy = ">=0.910"
 nitpick = "^0.27.0"
-flake8-keyword-arguments = "^0.1.0"
-importlib-metadata = {version = "^4.8.1", python = "<3.10"}
+pep8-naming = "^0.12.1"
 typing-extensions = { version = "^3.7.4.3", python = "<3.8" }
 
 [tool.poetry.dev-dependencies]
@@ -69,17 +70,17 @@ BZ = "buzzvil_python_styleguide:RequestsTimeoutPlugin"
 force-exclude = "(\n  /(\n    \\.eggs\n  | \\.git\n  | \\.hg\n  | \\.mypy_cache\n  | \\.tox\n  | \\.venv\n  | _build\n  | buck-out\n  | build\n  | dist\n  )/\n  | migrations/\n  | venv.?\n)\n"
 line-length = 120
 skip-string-normalization = true
-target-version = ["py39"]
+target-version = ["py36", "py37", "py38", "py39"]
 
 
 [tool.nitpick]
 style = "src/buzzvil_python_styleguide/styles/nitpick-style.toml"
+cache = "never"
 
 [tool.mypy]
 allow_redefinition = true
 disallow_any_decorated = true
 disallow_any_explicit = true
-disallow_any_expr = true
 disallow_any_generics = true
 disallow_incomplete_defs = true
 disallow_subclassing_any = true
@@ -94,3 +95,9 @@ warn_redundant_casts = true
 warn_return_any = true
 warn_unreachable = true
 warn_unused_ignores = true
+
+# Output configuration
+show_error_context = true
+show_column_numbers = true
+show_error_codes = true
+pretty = true

setup.cfg

@@ -1,16 +1,19 @@
 [flake8]
 exclude = venv*,**/migrations/
-ignore = W503,E203,FI12,FI15,FI16,FI17,FI55,FI58,PT003,C408,C400,C401
+ignore = W503,E203,FI12,FI15,FI16,FI17,FI55,FI58,PT003,C408,C400,C401,CFQ004
 
 max-line-length = 120
 require-code = True
 max-parameters-amount = 10
 max-annotations-complexity = 4
 min-version = 3.6.2
-max-pos_args = 2
 per-file-ignores =
-    **/tests/**.py:FI18,CFQ001,E501,
+    **/tests/**.py:FI18,CFQ001,E501,S101,
+    tests/**.py:FI18,CFQ001,E501,S101,
     __init__.py:F401
 # flake8-pytest-style
 pytest-parametrize-values-type = tuple
 eradicate-whitelist = mypy:#noqa:
+# flake8-force-keyword-arguments
+kwargs-max-positional-arguments = 2
+kwargs-ignore-function-pattern-extend = ^pytest.mark.parametrize$

src/buzzvil_python_styleguide/__init__.py

@@ -1,9 +1,13 @@
-from typing_extensions import Final
+# mypy: allow_untyped_calls
 
-try:
-    from importlib.metadata import version
-except ModuleNotFoundError:
+import sys
+
+if sys.version_info < (3, 8):
+    from typing_extensions import Final
     from importlib_metadata import version
+else:
+    from typing import Final
+    from importlib.metadata import version
 
 __version__: Final[str] = version(__name__)
 

src/buzzvil_python_styleguide/plugin.py

@@ -1,33 +1,22 @@
 import ast
-from collections import deque
-from typing import ClassVar, Deque, Iterable, Tuple, Type
+from typing import ClassVar, Iterable, Tuple, Type
 
 import buzzvil_python_styleguide
 
 
-class FuncCallVisitor(ast.NodeVisitor):
-    _name: Deque[str]
+def get_invocation_line(c: ast.Call) -> str:
+    def dfs(a: ast.AST) -> str:
+        child = getattr(a, 'value', None)
+        name = getattr(a, 'id', getattr(a, 'attr', None))
 
-    def __init__(self) -> None:
-        self._name = deque()
+        if child is None or not isinstance(child, ast.AST):
+            if name is None or not isinstance(name, str):
+                return ''
+            return name
 
-    @property
-    def name(self) -> str:
-        return '.'.join(self._name)
+        return '.'.join(filter(None, (dfs(child), name)))
 
-    @name.deleter
-    def name(self) -> None:
-        self._name.clear()
-
-    def visit_Name(self, node: ast.Name) -> None:  # noqa: N802
-        self._name.appendleft(node.id)
-
-    def visit_Attribute(self, node: ast.Attribute) -> None:  # noqa: N802
-        self._name.appendleft(node.attr)
-        if isinstance(node.value, ast.Name):  # type: ignore[misc]
-            self._name.appendleft(node.value.id)
-        else:
-            self.generic_visit(node)
+    return dfs(c.func)
 
 
 class RequestsTimeoutPlugin:
@@ -44,13 +33,12 @@ def run(self) -> Iterable[Tuple[int, int, str, Type['RequestsTimeoutPlugin']]]:
         :return: (lineno, col_offset, error_string, Type)
         """
         for node in ast.walk(self.tree):
-            if not isinstance(node, ast.Call):  # type: ignore[misc]
+            if not isinstance(node, ast.Call):
                 continue
 
-            callvisitor = FuncCallVisitor()
-            callvisitor.visit(node.func)
+            invocation_line = get_invocation_line(node)
             # There can be different ways of calling requests method but this covers almost all cases.
-            if callvisitor.name not in ('requests.get', 'requests.post', 'session.get', 'session.post'):
+            if invocation_line not in ('requests.get', 'requests.post', 'session.get', 'session.post'):
                 continue
 
             if 'timeout' not in [k.arg for k in node.keywords]:

src/buzzvil_python_styleguide/styles/flake8.toml

@@ -5,16 +5,18 @@ max-line-length = 120
 require-code = true
 
 exclude = "venv*,**/migrations/"
-per-file-ignores = "**/tests/**.py:FI18,CFQ001,E501,__init__.py:F401"
+per-file-ignores = "**/tests/**.py:FI18,CFQ001,E501,S101,tests/**.py:FI18,CFQ001,E501,S101,__init__.py:F401"
 
 # flake8-functions
 max-parameters-amount = 10
 # flake8-annotations-complexity
 max-annotations-complexity = 4
-max-pos_args = 2
 # flake8-pytest-style
 pytest-parametrize-values-type = 'tuple'
 eradicate-whitelist = 'mypy:#noqa:'
+# flake8-force-keyword-arguments
+kwargs-max-positional-arguments = 2
+kwargs-ignore-function-pattern-extend = '^pytest.mark.parametrize$'
 
 [nitpick.files."setup.cfg"]
-comma_separated_values = ["flake8.ignore", "flake8.exclude", "flake8.per-file-ignores"]
+comma_separated_values = ["flake8.ignore", "flake8.exclude", "flake8.per-file-ignores", "flake8.kwargs-ignore-function-pattern-extend"]

src/buzzvil_python_styleguide/styles/mypy.toml

@@ -18,3 +18,9 @@ no_implicit_reexport = true
 ##
 
 allow_redefinition = true
+
+# Output configuration
+show_error_context = true
+show_column_numbers = true
+show_error_codes = true
+pretty = true

tests/test_func_call_visitor.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from buzzvil_python_styleguide.plugin import FuncCallVisitor, RequestsTimeoutPlugin
+from buzzvil_python_styleguide.plugin import RequestsTimeoutPlugin, get_invocation_line
 
 
 class TestFucCallVisitor:
@@ -21,10 +21,8 @@ class TestFucCallVisitor:
         ),
     )
     def test_name(self, source: str, expected: str) -> None:
-        v = FuncCallVisitor()
-        tree = ast.parse(source)
-        v.visit(tree)
-        assert expected == v.name
+        c = ast.parse(source).body[0].value  # type: ignore[attr-defined]
+        assert expected == get_invocation_line(c)
 
 
 class TestRequestsTimeoutPlugin: