Requirements upgrade

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=.git,__pycache__,docs/source/conf.py,old,build,dist,venv,test/resources,.eggs,review.egg-info,.pytest_cache,node_modules
         # TODO: change max-complexity into 10 after refactoring
-        flake8 . --count --max-complexity=11 --max-line-length=120 --max-doc-length=120 --ignore=I201,I202,I101,I100,R504,A003,E800,SC200,SC100,E402,W503,WPS,C812,H601 --statistics --exclude=.git,__pycache__,docs/source/conf.py,old,build,dist,venv,test/resources,.eggs,review.egg-info,.pytest_cache,node_modules
+        flake8 . --count --max-complexity=11 --max-line-length=120 --max-doc-length=120 --ignore=R504,A003,E800,SC200,SC100,E402,W503,WPS,H601 --statistics --exclude=.git,__pycache__,docs/source/conf.py,old,build,dist,venv,test/resources,.eggs,review.egg-info,.pytest_cache,node_modules
     - name: Set up Eslint
       run: |
         npm install eslint --save-dev

README.md

@@ -33,7 +33,10 @@ Python language:
 - [x]  Pylint [GNU LGPL v2]
     * [Site and docs](https://www.pylint.org/)
     * [Repository](https://github.com/PyCQA/pylint)
-
+
+- [x] Radon [MIT]
+    * [Site and docs](https://radon.readthedocs.io/en/latest/)
+    * [Repository](https://github.com/rubik/radon)
 
 Java language:
 
@@ -92,7 +95,7 @@ Argument | Description
 --- | ---
 **‑h**, **‑‑help**      |  show the help message and exit.
 **‑v**, **‑‑verbosity** |  choose logging level according [this](https://docs.python.org/3/library/logging.html#levels) list: `1` - **ERROR**; `2` - **INFO**; `3` - **DEBUG**; `0` - disable logging (**CRITICAL** value); default value is `0` (**CRITICAL**).
-**‑d**, **‑‑disable**   |  disable inspectors. Available values: for **Python** language: `pylint` for [Pylint](https://github.com/PyCQA/pylint), `flake8` for [flake8](https://flake8.pycqa.org/en/latest/), `python_ast` to check different measures providing by AST; for **Java** language: `checkstyle` for the [Checkstyle](https://checkstyle.sourceforge.io/), `pmd` for [PMD](https://pmd.github.io/); for `Kotlin` language: detekt for [Detekt](https://detekt.github.io/detekt/); for **JavaScript** language: `eslint` for [ESlint](https://eslint.org/). Example: `-d pylint,flake8`.
+**‑d**, **‑‑disable**   |  disable inspectors. Available values: for **Python** language: `pylint` for [Pylint](https://github.com/PyCQA/pylint), `flake8` for [flake8](https://flake8.pycqa.org/en/latest/), `radon` for [Radon](https://radon.readthedocs.io/en/latest/), `python_ast` to check different measures providing by AST; for **Java** language: `checkstyle` for the [Checkstyle](https://checkstyle.sourceforge.io/), `pmd` for [PMD](https://pmd.github.io/); for `Kotlin` language: detekt for [Detekt](https://detekt.github.io/detekt/); for **JavaScript** language: `eslint` for [ESlint](https://eslint.org/). Example: `-d pylint,flake8`.
 **‑‑allow-duplicates**        |  allow duplicate issues found by different linters. By default, duplicates are skipped.
 **‑‑language-version**, **‑‑language_version**  |  specify the language version for JAVA inspectors. Available values: `java7`, `java8`, `java9`, `java11`. **Note**: **‑‑language_version** is deprecated. Will be deleted in the future.
 **‑‑n-cpu**, **‑‑n_cpu**  |  specify number of _cpu_ that can be used to run inspectors. **Note**: **‑‑n_cpu** is deprecated. Will be deleted in the future.

requirements-test.txt

@@ -1,8 +1,8 @@
-pytest~=5.4.3
+pytest~=6.2.3
 pytest-runner
 pytest-subtests
 jsonschema==3.2.0
-Django~=3.0.8
-pylint~=2.5.3
-requests~=2.24.0
-setuptools~=47.3.1
+Django~=3.2
+pylint~=2.7.4
+requests~=2.25.1
+setuptools~=56.0.0

requirements.txt

@@ -1,28 +1,29 @@
-setuptools==47.3.1
+setuptools==56.0.0
 
 # python code analysis tools
-pylint==2.5.3
-pylint-django==2.0.15
-flake8==3.8.3
+pylint==2.7.4
+pylint-django==2.3.0
+flake8==3.9.0
 
 # flake8 plugins
-flake8-bugbear==20.1.4
+flake8-bugbear==21.4.3
 flake8-builtins==1.5.3
-flake8-comprehensions==3.2.3
-flake8-eradicate==0.4.0
+flake8-comprehensions==3.4.0
+flake8-eradicate==1.0.0
 flake8-import-order==0.18.1
-flake8-plugin-utils==1.3.0
+flake8-plugin-utils==1.3.1
 flake8-polyfill==1.0.2
-flake8-return==1.1.1
-flake8-spellcheck==0.14.0
+flake8-return==1.1.2
+flake8-spellcheck==0.24.0
 mccabe==0.6.1
 pep8-naming==0.11.1
 wps-light==0.15.2
 flake8-broken-line==0.3.0
 flake8-string-format==0.3.0
 flake8-commas==2.0.0
 cohesion==1.0.0
+radon==4.5.0
 
 # extra libraries and frameworks
-django==3.0.8
-requests==2.24.0
+django==3.2
+requests==2.25.1

setup.py

@@ -45,22 +45,22 @@ def get_inspectors_additional_files() -> List[str]:
         'Topic :: Software Development :: Build Tools',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 3',
-        'Operating System :: OS Independent'
+        'Operating System :: OS Independent',
     ],
     keywords='code review',
     python_requires='>=3.8, <4',
     install_requires=['upsourceapi'],
     packages=find_packages(exclude=[
         '*.unit_tests', '*.unit_tests.*', 'unit_tests.*', 'unit_tests',
-        '*.functional_tests', '*.functional_tests.*', 'functional_tests.*', 'functional_tests'
+        '*.functional_tests', '*.functional_tests.*', 'functional_tests.*', 'functional_tests',
     ]),
     zip_safe=False,
     package_data={
-        '': get_inspectors_additional_files()
+        '': get_inspectors_additional_files(),
     },
     entry_points={
         'console_scripts': [
-            'review=review.run_tool:main'
-        ]
-    }
+            'review=review.run_tool:main',
+        ],
+    },
 )

src/python/review/application_config.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from enum import Enum, unique
-from typing import Optional, Set, List
+from typing import List, Optional, Set
 
 from src.python.review.inspectors.inspector_type import InspectorType
 

src/python/review/common/file_system.py

@@ -4,7 +4,7 @@
 from contextlib import contextmanager
 from enum import Enum, unique
 from pathlib import Path
-from typing import List, Union, Callable
+from typing import Callable, List, Union
 
 
 @unique
@@ -77,7 +77,7 @@ def create_directory(directory: str) -> None:
 def get_file_line(path: Path, line_number: int):
     return linecache.getline(
         str(path),
-        line_number
+        line_number,
     ).strip()
 
 

src/python/review/common/java_compiler.py

@@ -18,7 +18,7 @@ def javac(javac_args: Union[str, Path]) -> bool:
         output_bytes: bytes = subprocess.check_output(
             f'javac {javac_args}',
             shell=True,
-            stderr=subprocess.STDOUT
+            stderr=subprocess.STDOUT,
         )
         output_str = str(output_bytes, Encoding.UTF_ENCODING.value)
 

src/python/review/common/parallel_runner.py

@@ -37,7 +37,7 @@ def inspect_in_parallel(path: Path,
     with multiprocessing.Pool(config.n_cpu) as pool:
         issues = pool.map(
             functools.partial(run_inspector, path, config),
-            inspectors
+            inspectors,
         )
 
     return list(itertools.chain(*issues))

src/python/review/common/subprocess_runner.py

@@ -9,7 +9,7 @@ def run_in_subprocess(command: List[str]) -> str:
     process = subprocess.run(
         command,
         stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE
+        stderr=subprocess.PIPE,
     )
 
     stdout = process.stdout.decode()

src/python/review/inspectors/checkstyle/checkstyle.py

@@ -35,15 +35,15 @@ class CheckstyleInspector(BaseInspector):
             r'Boolean expression complexity is (\d+)',
 
         'LineLengthCheck':
-            r'Line is longer than \d+ characters \(found (\d+)\)'
+            r'Line is longer than \d+ characters \(found (\d+)\)',
     }
 
     @classmethod
     def _create_command(cls, path: Path, output_path: Path) -> List[str]:
         return [
             'java', '-jar', PATH_TOOLS_CHECKSTYLE_JAR,
             '-c', PATH_TOOLS_CHECKSTYLE_CONFIG,
-            '-f', 'xml', '-o', output_path, str(path)
+            '-f', 'xml', '-o', output_path, str(path),
         ]
 
     def inspect(self, path: Path, config: dict) -> List[BaseIssue]:

src/python/review/inspectors/common.py

@@ -0,0 +1,12 @@
+from math import floor
+
+
+def convert_percentage_of_value_to_lack_of_value(percentage_of_value: float) -> int:
+    """
+    Converts percentage of value to lack of value.
+    Calculated by the formula: floor(100 - percentage_of_value).
+
+    :param percentage_of_value: value in the range from 0 to 100.
+    :return: lack of value.
+    """
+    return floor(100 - percentage_of_value)

src/python/review/inspectors/detekt/detekt.py

@@ -27,7 +27,7 @@ class DetektInspector(BaseInspector):
         'ComplexCondition':
             r'This condition is too complex \((\d+)\)',
         'ComplexMethod':
-            r'The function .* appears to be too complex \((\d+)\)'
+            r'The function .* appears to be too complex \((\d+)\)',
     }
 
     @classmethod
@@ -38,7 +38,7 @@ def _create_command(cls, path: Path, output_path: Path):
             '--config', PATH_DETEKT_CONFIG,
             '--plugins', PATH_DETEKT_PLUGIN,
             '--report', f'xml:{output_path}',
-            '--input', str(path)
+            '--input', str(path),
         ]
 
     def inspect(self, path: Path, config) -> List[BaseIssue]:

src/python/review/inspectors/eslint/eslint.py

@@ -17,7 +17,7 @@ class ESLintInspector(BaseInspector):
 
     origin_class_to_pattern = {
         'complexity':
-            r'complexity of (\d+)'
+            r'complexity of (\d+)',
     }
 
     @classmethod

src/python/review/inspectors/flake8/.flake8

@@ -1,5 +1,8 @@
 [flake8]
 disable_noqa=True
+
+dictionaries=en_US,python,technical,django
+
 ignore=W291,  # trailing whitespaces
        W292,  # no newline at end of file
        W293,  # blank line contains whitespaces
@@ -50,5 +53,4 @@ ignore=W291,  # trailing whitespaces
        F524, # missing argument. TODO: Collision with "P201" and "P202"
        F525, # mixing automatic and manual numbering. TODO: Collision with "P205"
        # flake8-commas
-       C814, # missing trailing comma in Python 
-
+       C814, # missing trailing comma in Python 2

src/python/review/inspectors/flake8/flake8.py

@@ -1,20 +1,20 @@
 import logging
-import math
 import re
 from pathlib import Path
 from typing import List
 
 from src.python.review.common.subprocess_runner import run_in_subprocess
 from src.python.review.inspectors.base_inspector import BaseInspector
+from src.python.review.inspectors.common import convert_percentage_of_value_to_lack_of_value
 from src.python.review.inspectors.flake8.issue_types import CODE_PREFIX_TO_ISSUE_TYPE, CODE_TO_ISSUE_TYPE
 from src.python.review.inspectors.inspector_type import InspectorType
 from src.python.review.inspectors.issue import (
     BaseIssue,
     CodeIssue,
+    CohesionIssue,
     CyclomaticComplexityIssue,
-    IssueType,
     IssueData,
-    CohesionIssue,
+    IssueType,
 )
 from src.python.review.inspectors.tips import get_cyclomatic_complexity_tip
 
@@ -69,7 +69,9 @@ def parse(cls, output: str) -> List[BaseIssue]:
                 issues.append(CyclomaticComplexityIssue(**issue_data))
             elif cohesion_match is not None:  # flake8-cohesion
                 issue_data[IssueData.DESCRIPTION.value] = description  # TODO: Add tip
-                issue_data[IssueData.COHESION_LACK.value] = cls.__get_cohesion_lack(float(cohesion_match.group(1)))
+                issue_data[IssueData.COHESION_LACK.value] = convert_percentage_of_value_to_lack_of_value(
+                    float(cohesion_match.group(1)),
+                )
                 issue_data[IssueData.ISSUE_TYPE.value] = IssueType.COHESION
                 issues.append(CohesionIssue(**issue_data))
             else:
@@ -98,14 +100,3 @@ def choose_issue_type(code: str) -> IssueType:
             return IssueType.BEST_PRACTICES
 
         return issue_type
-
-    @staticmethod
-    def __get_cohesion_lack(cohesion_percentage: float) -> int:
-        """
-        Converts cohesion percentage to lack of cohesion.
-        Calculated by the formula: floor(100 - cohesion_percentage).
-
-        :param cohesion_percentage: cohesion set as a percentage.
-        :return: lack of cohesion
-        """
-        return math.floor(100 - cohesion_percentage)

src/python/review/inspectors/inspector_type.py

@@ -8,6 +8,7 @@ class InspectorType(Enum):
     PYLINT = 'PYLINT'
     PYTHON_AST = 'PYTHON_AST'
     FLAKE8 = 'FLAKE8'
+    RADON = 'RADON'
 
     # Java language
     PMD = 'PMD'
@@ -29,6 +30,7 @@ def available_values(cls) -> List[str]:
             cls.PYLINT.value,
             cls.FLAKE8.value,
             cls.PYTHON_AST.value,
+            cls.RADON.value,
 
             # Java language
             cls.PMD.value,

src/python/review/inspectors/intellij/intellij.py

@@ -48,7 +48,7 @@ def __init__(self):
     def create_command(output_dir_path) -> List[Union[str, Path]]:
         return [
             INTELLIJ_INSPECTOR_EXECUTABLE, INTELLIJ_INSPECTOR_PROJECT,
-            INTELLIJ_INSPECTOR_SETTINGS, output_dir_path, '-v2'
+            INTELLIJ_INSPECTOR_SETTINGS, output_dir_path, '-v2',
         ]
 
     def inspect(self, path: Path, config: dict) -> List[BaseIssue]:
@@ -134,8 +134,8 @@ def parse(cls, out_dir_path: Path,
                         file_path = Path(
                             text.replace(
                                 'file://$PROJECT_DIR$',
-                                str(INTELLIJ_INSPECTOR_PROJECT)
-                            )
+                                str(INTELLIJ_INSPECTOR_PROJECT),
+                            ),
                         )
                     elif tag == 'line':
                         line_no = int(text)
@@ -160,7 +160,7 @@ def parse(cls, out_dir_path: Path,
                             description=description,
                             origin_class=issue_class,
                             inspector_type=cls.inspector_type,
-                            type=issue_type
+                            type=issue_type,
                         ))
 
         return issues

src/python/review/inspectors/intellij/issue_types/__init__.py

@@ -1,18 +1,15 @@
 from typing import Dict
 
-from src.python.review.inspectors.issue import IssueType
-
 from src.python.review.inspectors.intellij.issue_types.java import (
     ISSUE_CLASS_TO_ISSUE_TYPE as JAVA_ISSUE_CLASS_TO_ISSUE_TYPE,
 )
-
 from src.python.review.inspectors.intellij.issue_types.kotlin import (
     ISSUE_CLASS_TO_ISSUE_TYPE as KOTLIN_ISSUE_CLASS_TO_ISSUE_TYPE,
 )
-
 from src.python.review.inspectors.intellij.issue_types.python import (
     ISSUE_CLASS_TO_ISSUE_TYPE as PYTHON_ISSUE_CLASS_TO_ISSUE_TYPE,
 )
+from src.python.review.inspectors.issue import IssueType
 
 ISSUE_CLASS_TO_ISSUE_TYPE: Dict[str, IssueType] = {
     **JAVA_ISSUE_CLASS_TO_ISSUE_TYPE,

src/python/review/inspectors/intellij/issue_types/kotlin.py

@@ -378,5 +378,5 @@
     '\'when\' that can be simplified by introducing an argument':
         IssueType.CODE_STYLE,
 
-    'Annotator': IssueType.ERROR_PRONE
+    'Annotator': IssueType.ERROR_PRONE,
 }