Merge pull request #23 from xoryman/master

Fix bug fix literal string annotations

Author: Arondit

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11']
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}

.github/workflows/build_pr.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11']
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

flake8_annotations_complexity/__init__.py

@@ -1 +1 @@
-__version__ = '0.0.8'
+__version__ = '0.1.0'

flake8_annotations_complexity/ast_helpers.py

@@ -1,41 +1,57 @@
 import ast
-import sys
+from logging import getLogger
 from typing import List, Tuple, Any
 
+logger = getLogger(__name__)
 
-def get_annotation_complexity(annotation_node, default_complexity: int = 1) -> int:
+
+def get_annotation_complexity(annotation_node) -> int:
+    """
+    Recursively counts complexity of annotation nodes.
+
+    When annotations are written as strings,
+    we additionally parse them to ``ast`` nodes.
+    """
     if isinstance(annotation_node, ast.Str):
+        # try to parse string-wrapped annotations
         try:
             annotation_node = ast.parse(annotation_node.s).body[0].value  # type: ignore
-        except (SyntaxError, IndexError):
-            return default_complexity
-    complexity = default_complexity
+        except Exception as exc:
+            logger.debug(f'Cannot parse string-wrapped annotation: {exc!r}')
+            return 1
+
     if isinstance(annotation_node, ast.Subscript):
-        if sys.version_info >= (3, 9):
-            complexity = 1 + get_annotation_complexity(annotation_node.slice)
-        else:
-            complexity = 1 + get_annotation_complexity(annotation_node.slice.value)  # type: ignore
-    if isinstance(annotation_node, ast.Tuple):
-        complexity = max((get_annotation_complexity(n) for n in annotation_node.elts), default=1)
-    return complexity
+        return 1 + get_annotation_complexity(annotation_node.slice)
+
+    if isinstance(annotation_node, (ast.Tuple, ast.List)):
+        return max((get_annotation_complexity(n) for n in annotation_node.elts), default=1)
+
+    return 1
 
 
 def get_annotation_len(annotation_node) -> int:
-    annotation_len = 0
+    """
+    Recursively counts length of annotation nodes.
+
+    When annotations are written as strings,
+    we additionally parse them to ``ast`` nodes.
+    """
     if isinstance(annotation_node, ast.Str):
+        # try to parse string-wrapped annotations
         try:
             annotation_node = ast.parse(annotation_node.s).body[0].value  # type: ignore
-        except (SyntaxError, IndexError):
-            return annotation_len
+        except Exception as exc:
+            logger.debug(f'Cannot parse string-wrapped annotation: {exc!r}')
+            return 0
+
     if isinstance(annotation_node, ast.Subscript):
         try:
-            if sys.version_info >= (3, 9):
-                annotation_len = len(annotation_node.slice.elts)  # type: ignore
-            else:
-                annotation_len = len(annotation_node.slice.value.elts)  # type: ignore
+            return len(annotation_node.slice.elts)  # type: ignore
         except AttributeError:
-            annotation_len = 0
-    return annotation_len
+            logger.debug('Attribute error on annotation length counting')
+            return 0
+
+    return 0
 
 
 def validate_annotations_in_ast_node(

requirements_dev.txt

@@ -3,7 +3,6 @@ pytest-cov==3.0.0
 pydocstyle==6.1.1
 flake8==4.0.1
 flake8-2020==1.6.0
-flake8-annotations-complexity==0.0.6
 flake8-blind-except==0.2.0
 flake8-broken-line==0.4.0
 flake8-bugbear==22.1.11

setup.cfg

@@ -1,9 +1,10 @@
 [flake8]
 max-complexity = 8
 max-line-length = 120
-ignore = W503, P103, D
+ignore = W503, P103, D, B902
 exclude = node_modules,env,venv,venv36,tests
 max-annotations-complexity = 4
+max-returns-amount = 4
 var_names_exclude_pathes = node_modules,env,venv,venv36
 assert_allowed_in_pathes = tests,migrations,env,venv,venv36
 adjustable-default-max-complexity = 8

setup.py

@@ -30,15 +30,13 @@ def get_long_description() -> str:
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Software Development :: Quality Assurance',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
     ],
     long_description=get_long_description(),
     long_description_content_type='text/markdown',
-    python_requires='>=3.7',
+    python_requires='>=3.9',
     packages=find_packages(),
     include_package_data=True,
     keywords='flake8 annotations',

tests/test_annotations_complexity.py

@@ -20,8 +20,10 @@ def test_ok_for_unannotated_file():
 def test_ok_for_dynamic_annotations_file():
     errors = run_validator_for_test_file('dynamic_annotations.py')
     assert len(errors) == 1
+    errors = run_validator_for_test_file('dynamic_annotations.py', max_annotations_complexity=2)
+    assert len(errors) == 1
     errors = run_validator_for_test_file('dynamic_annotations.py', max_annotations_complexity=1)
-    assert len(errors) == 2
+    assert len(errors) == 3
 
 
 def test_ok_for_string_annotations_file():

tests/test_files/dynamic_annotations.py

@@ -1,4 +1,10 @@
-from typing import List, Dict, Optional, Tuple
+from typing import (
+    List,
+    Dict,
+    Optional,
+    Tuple,
+    Literal,
+)
 
 
 def foo() -> List[int]:
@@ -7,3 +13,7 @@ def foo() -> List[int]:
 
 def bar(arg1: str, arg2: Tuple[List[int], Optional[Dict[str, int]]]) -> int:
     return 1
+
+
+def gaz() -> Literal['regular', 'raise', 'is']:
+    raise Exception