Merge pull request #321 from online-judge-tools/upgrade-formatters

Upgrade the versions of formatters

Author: kmyk

.github/workflows/format.yml

@@ -19,6 +19,6 @@ jobs:
       run: |
         oj-verify -h
         pylint --disable=all --enable=unused-import onlinejudge_verify onlinejudge_bundle tests setup.py
-        isort --check-only --diff --recursive onlinejudge_verify onlinejudge_bundle tests setup.py
+        isort --check-only --diff onlinejudge_verify onlinejudge_bundle tests setup.py
         yapf --diff --recursive onlinejudge_verify onlinejudge_bundle tests setup.py | tee yapf.patch && test ! -s yapf.patch
         mypy onlinejudge_verify onlinejudge_bundle setup.py

onlinejudge_bundle/main.py

@@ -6,6 +6,7 @@
 from typing import *
 
 import colorlog
+
 import onlinejudge_verify.languages.list
 
 logger = getLogger(__name__)

onlinejudge_verify/documentation/build.py

@@ -7,11 +7,12 @@
 from logging import getLogger
 from typing import *
 
+import pkg_resources
+import yaml
+
 import onlinejudge_verify.documentation.front_matter
 import onlinejudge_verify.languages.list
 import onlinejudge_verify.utils as utils
-import pkg_resources
-import yaml
 from onlinejudge_verify.documentation.type import *
 
 logger = getLogger(__name__)
@@ -86,11 +87,11 @@ def _render_source_code_stat(stat: SourceCodeStat, *, basedir: pathlib.Path) ->
 
 
 def _render_source_code_stat_for_page(
-        path: pathlib.Path,
-        *,
-        source_code_stats_dict: Dict[pathlib.Path, SourceCodeStat],
-        page_title_dict: Dict[pathlib.Path, str],
-        basedir: pathlib.Path,
+    path: pathlib.Path,
+    *,
+    source_code_stats_dict: Dict[pathlib.Path, SourceCodeStat],
+    page_title_dict: Dict[pathlib.Path, str],
+    basedir: pathlib.Path,
 ) -> Dict[str, Any]:
     relative_path = (basedir / path).resolve().relative_to(basedir)
     stat = source_code_stats_dict[relative_path]
@@ -114,10 +115,10 @@ def ext(relative_path: pathlib.Path) -> Dict[str, Any]:
 
 
 def _render_source_code_stats_for_top_page(
-        *,
-        source_code_stats: List[SourceCodeStat],
-        page_title_dict: Dict[pathlib.Path, str],
-        basedir: pathlib.Path,
+    *,
+    source_code_stats: List[SourceCodeStat],
+    page_title_dict: Dict[pathlib.Path, str],
+    basedir: pathlib.Path,
 ) -> Dict[str, Any]:
     libraryCategories: Dict[str, List[Dict[str, str]]] = {}
     verificationCategories: Dict[str, List[Dict[str, str]]] = {}

onlinejudge_verify/documentation/configure.py

@@ -129,14 +129,14 @@ def _build_verification_status(paths: List[pathlib.Path], *, verified_with: Dict
 
 
 def _get_source_code_stat(
-        path: pathlib.Path,
-        *,
-        depends_on: Dict[pathlib.Path, List[pathlib.Path]],
-        required_by: Dict[pathlib.Path, List[pathlib.Path]],
-        verified_with: Dict[pathlib.Path, List[pathlib.Path]],
-        verification_status: Dict[pathlib.Path, VerificationStatus],
-        marker: VerificationMarker,
-        basedir: pathlib.Path,
+    path: pathlib.Path,
+    *,
+    depends_on: Dict[pathlib.Path, List[pathlib.Path]],
+    required_by: Dict[pathlib.Path, List[pathlib.Path]],
+    verified_with: Dict[pathlib.Path, List[pathlib.Path]],
+    verification_status: Dict[pathlib.Path, VerificationStatus],
+    marker: VerificationMarker,
+    basedir: pathlib.Path,
 ) -> SourceCodeStat:
     absolute_path = (basedir / path).resolve()
     relative_path = absolute_path.relative_to(basedir)

onlinejudge_verify/documentation/main.py

@@ -3,11 +3,12 @@
 from logging import getLogger
 from typing import *
 
+import pkg_resources
+import yaml
+
 import onlinejudge_verify.documentation.build as build
 import onlinejudge_verify.documentation.configure as configure
 import onlinejudge_verify.marker
-import pkg_resources
-import yaml
 from onlinejudge_verify.documentation.type import *
 
 logger = getLogger(__name__)

onlinejudge_verify/languages/python.py

@@ -9,6 +9,7 @@
 import importlab.environment
 import importlab.fs
 import importlab.graph
+
 from onlinejudge_verify.languages.models import Language, LanguageEnvironment
 
 logger = getLogger(__name__)

onlinejudge_verify/verify.py

@@ -9,11 +9,10 @@
 from logging import getLogger
 from typing import *
 
+import onlinejudge
 import onlinejudge_verify.languages.list
 import onlinejudge_verify.marker
 
-import onlinejudge
-
 logger = getLogger(__name__)
 
 

setup.cfg

@@ -15,10 +15,10 @@ classifiers =
 
 [options.extras_require]
 dev =
-    isort == 4.3.21
-    mypy == 0.740
-    pylint == 2.4.3
-    yapf == 0.28.0
+    isort == 5.5.2
+    mypy == 0.782
+    pylint == 2.6.0
+    yapf == 0.30.0
 
 [yapf]
 column_limit = 9999