Uprev black, restrict packaging version, fix black related suggestions.[CPP-330]

console_backend/setup.py

@@ -11,7 +11,7 @@ def get_py_version_cfgs():
     py3_min = 6
     out_cfg = []
     for minor in range(py3_min, version[1] + 1):
-        out_cfg.append("--cfg=Py_3_%d" % minor)
+        out_cfg.append(f"--cfg=Py_3_{minor}")
 
     if platform.python_implementation() == "PyPy":
         out_cfg.append("--cfg=PyPy")

pyproject.toml

@@ -22,6 +22,7 @@ psutil = "5.8.0"
 qt5-applications = [{ version = "^5.15.2" }]
 py2many = ">=0.3"
 types-requests = "^2.25.0"
+packaging = "<21.0"
 
 [build-system]
 requires = [

requirements-dev.txt

@@ -1,45 +1,46 @@
-altgraph==0.17; sys_platform == "darwin" and python_version >= "3.5"
-appdirs==1.4.4; python_full_version >= "3.6.2"
-astroid==2.6.2; python_version >= "3.6" and python_version < "4.0"
+altgraph==0.17.2; sys_platform == "darwin" and python_version >= "3.5"
+astroid==2.8.0; python_version >= "3.6" and python_version < "4.0"
 atomicwrites==1.4.0; python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.4.0"
 attrs==21.2.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
-black==21.6b0; python_full_version >= "3.6.2"
+black==21.9b0; python_full_version >= "3.6.2"
 click==8.0.1; python_version >= "3.6" and python_full_version >= "3.6.2"
 colorama==0.4.4; python_version >= "3.6" and python_version < "4.0" and sys_platform == "win32" and python_full_version >= "3.6.2" and platform_system == "Windows"
 fbs @ git+https://github.com/silverjam/fbs.git@master
 future==0.18.2; sys_platform == "win32" and python_version >= "3.5" and python_full_version >= "3.6.0"
 iniconfig==1.1.1; python_version >= "3.6"
-isort==5.9.2; python_full_version >= "3.6.1" and python_version < "4.0" and python_version >= "3.6"
+isort==5.9.3; python_full_version >= "3.6.1" and python_version < "4.0" and python_version >= "3.6"
 jedi==0.18.0; python_version >= "3.6"
 lazy-object-proxy==1.6.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.0"
-macholib==1.14; sys_platform == "darwin" and python_version >= "3.5"
+macholib==1.15.2; sys_platform == "darwin" and python_version >= "3.5"
 mccabe==0.6.1; python_version >= "3.6" and python_version < "4.0"
 mypy-extensions==0.4.3; python_full_version >= "3.6.2" and python_version >= "3.5"
 mypy==0.910; python_version >= "3.5"
 nuitka==0.6.12.4
-packaging==21.0; python_version >= "3.6"
+packaging==20.9; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
 parso==0.8.2; python_version >= "3.6"
-pathspec==0.8.1; python_full_version >= "3.6.2"
-pefile==2021.5.24; sys_platform == "win32" and python_version >= "3.5" and python_full_version >= "3.6.0"
-pluggy==0.13.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
+pathspec==0.9.0; python_full_version >= "3.6.2"
+pefile==2021.9.3; sys_platform == "win32" and python_version >= "3.5" and python_full_version >= "3.6.0"
+platformdirs==2.3.0; python_version >= "3.6" and python_full_version >= "3.6.2" and python_version < "4.0"
+pluggy==1.0.0; python_version >= "3.6"
 psutil==5.8.0; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0")
 py2many==0.3; python_version >= "3.8"
 py==1.10.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 pycapnp==1.1.0
-pyinstaller-hooks-contrib==2021.2; python_version >= "3.5"
+pyinstaller-hooks-contrib==2021.3; python_version >= "3.5"
 pyinstaller==4.2; python_version >= "3.5"
-pylint==2.9.3; python_version >= "3.6" and python_version < "4.0"
-pyparsing==2.4.7; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6"
+pylint==2.11.1; python_version >= "3.6" and python_version < "4.0"
+pyparsing==2.4.7; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 pyside2==5.15.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0" and python_version < "3.10")
-pytest==6.2.4; python_version >= "3.6"
+pytest==6.2.5; python_version >= "3.6"
 pywin32-ctypes==0.2.0; sys_platform == "win32" and python_version >= "3.5"
 qt5-applications==5.15.2.2.2; python_version >= "3.5"
-regex==2021.7.6; python_full_version >= "3.6.2"
+regex==2021.8.28; python_full_version >= "3.6.2"
 semantic-version==2.8.5; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 setuptools-rust==0.12.1; python_version >= "3.6"
 shiboken2==5.15.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "3.10"
-toml==0.10.2; python_full_version >= "3.6.2" and python_version >= "3.5" and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.3.0") and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6")
+toml==0.10.2; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.3.0" and python_version >= "3.6" and python_version < "4.0"
+tomli==1.2.1; python_version >= "3.6" and python_full_version >= "3.6.2"
 toposort==1.6; python_version >= "3.8"
-types-requests==2.25.0
-typing-extensions==3.10.0.0; python_version >= "3.5"
+types-requests==2.25.7
+typing-extensions==3.10.0.2; python_full_version >= "3.6.2" and python_version >= "3.6" and python_version < "3.10"
 wrapt==1.12.1; python_version >= "3.6" and python_version < "4.0"

requirements.txt

@@ -1,10 +1,10 @@
-altgraph==0.17; sys_platform == "darwin" and python_version >= "3.5"
+altgraph==0.17.2; sys_platform == "darwin" and python_version >= "3.5"
 fbs @ git+https://github.com/silverjam/fbs.git@master
 future==0.18.2; sys_platform == "win32" and python_version >= "3.5" and python_full_version >= "3.6.0"
-macholib==1.14; sys_platform == "darwin" and python_version >= "3.5"
-pefile==2021.5.24; sys_platform == "win32" and python_version >= "3.5" and python_full_version >= "3.6.0"
+macholib==1.15.2; sys_platform == "darwin" and python_version >= "3.5"
+pefile==2021.9.3; sys_platform == "win32" and python_version >= "3.5" and python_full_version >= "3.6.0"
 pycapnp==1.1.0
-pyinstaller-hooks-contrib==2021.2; python_version >= "3.5"
+pyinstaller-hooks-contrib==2021.3; python_version >= "3.5"
 pyinstaller==4.2; python_version >= "3.5"
 pyside2==5.15.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0" and python_version < "3.10")
 pywin32-ctypes==0.2.0; sys_platform == "win32" and python_version >= "3.5"

utils/bench_runner.py

@@ -211,7 +211,7 @@ def run_disk_usage_benchmark():
     benchmarks = INSTALLER_BENCHMARKS.get(os_, [])
     for bench in benchmarks:
         release_file = ""
-        with open(bench[FILE_PATH]) as archive_file:
+        with open(bench[FILE_PATH], "r", encoding="utf-8") as archive_file:
             release_file = archive_file.readline().rstrip()
 
         bench_command = DISK_USAGE_COMMAND(release_file)
@@ -238,7 +238,7 @@ def run_backend_cpu_validate_benchmarks():
     os_ = sys.platform
     benchmarks = BACKEND_CPU_BENCHMARKS.get(os_, [])
     for bench in benchmarks:
-        with open(bench[FILE_PATH]) as fileo:
+        with open(bench[FILE_PATH], "r", encoding="utf-8") as fileo:
             bench_result = json.load(fileo)
             bench_value = get_nested_key(bench_result, bench[KEY_LOCATION])
             assert bench_value is not None, f"Test:{bench[NAME]} retrieved bench value None."
@@ -270,7 +270,7 @@ def run_frontend_cpu_benchmark(executable: str):
             f'{BENCHMARK_COMMAND_ARGS(bench[FILE_PATH])}"'
         )
         subprocess.call(bench_command, shell=True)
-        with open(DEFAULT_JSON_FILEPATH) as fileo:
+        with open(DEFAULT_JSON_FILEPATH, "r", encoding="utf-8") as fileo:
             bench_result = json.load(fileo)
             bench_value = bench_result[RESULTS][0].get(bench[KEY_LOCATION], None)
             assert bench_value is not None, f"Test:{bench[NAME]} retrieved bench value None."

utils/create_nuitka_script.py

@@ -27,7 +27,7 @@ def create_nuitka_script():
             out += f"--include-data-file={CONDA_PREFIX}/{SITEPACK_DIR}{path}={path} "
 
     filename_prefix = SYS_PLATFORM_PREFIXS.get(sys.platform, "unknown")
-    with open(os.path.join(NUITKA_DIR, filename_prefix + FILENAME_POSTFIX), "w") as filo:
+    with open(os.path.join(NUITKA_DIR, filename_prefix + FILENAME_POSTFIX), "w", encoding="utf-8") as filo:
         filo.write(DEFAULT_NUITKA_COMMAND + out[: -len(" ")])
         filo.write("\n")
 

utils/get_fbs_remove_list.py

@@ -21,7 +21,7 @@ def create_remove_negligibles_file():
                 continue
             out += f'rm -rf "{INSTALLER_DIR}/{path}" && '
     filename_prefix = SYS_PLATFORM_PREFIXS.get(sys.platform, "unknown")
-    with open(os.path.join(FBS_DIR, filename_prefix + FILENAME_POSTFIX), "w") as filo:
+    with open(os.path.join(FBS_DIR, filename_prefix + FILENAME_POSTFIX), "w", encoding="utf-8") as filo:
         filo.write(out[: -len("&& ")])
         filo.write("\n")