pin Black to (20)22 & reformat using the new stable release

Author: mr-c

Makefile

@@ -25,8 +25,8 @@ MODULE=cwltool
 # `SHELL=bash` doesn't work for some, so don't use BASH-isms like
 # `[[` conditional expressions.
 PYSOURCES=$(wildcard ${MODULE}/**.py tests/*.py) setup.py
-DEVPKGS=diff_cover black pylint pep257 pydocstyle flake8 tox tox-pyenv \
-	isort wheel autoflake flake8-bugbear pyupgrade bandit \
+DEVPKGS=diff_cover pylint pep257 pydocstyle tox tox-pyenv \
+	isort wheel autoflake pyupgrade bandit -rlint-requirements.txt\
 	-rtest-requirements.txt -rmypy-requirements.txt
 DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pydocstyle sloccount \
 	   python-flake8 python-mock shellcheck

cwltool/executors.py

@@ -277,7 +277,7 @@ def __init__(self) -> None:
         self.pending_jobs = []  # type: List[JobsType]
         self.pending_jobs_lock = threading.Lock()
 
-        self.max_ram = int(psutil.virtual_memory().available / 2 ** 20)  # type: ignore[no-untyped-call]
+        self.max_ram = int(psutil.virtual_memory().available / 2**20)  # type: ignore[no-untyped-call]
         self.max_cores = float(psutil.cpu_count())
         self.allocated_ram = float(0)
         self.allocated_cores = float(0)

cwltool/expression.py

@@ -39,9 +39,9 @@ def jshead(engine_config: List[str], rootvars: CWLObjectType) -> str:
 seg_single = r"""\['([^']|\\')+'\]"""
 seg_double = r"""\["([^"]|\\")+"\]"""
 seg_index = r"""\[[0-9]+\]"""
-segments = fr"(\.{seg_symbol}|{seg_single}|{seg_double}|{seg_index})"
+segments = rf"(\.{seg_symbol}|{seg_single}|{seg_double}|{seg_index})"
 segment_re = re.compile(segments, flags=re.UNICODE)
-param_str = fr"\(({seg_symbol}){segments}*\)$"
+param_str = rf"\(({seg_symbol}){segments}*\)$"
 param_re = re.compile(param_str, flags=re.UNICODE)
 
 

cwltool/job.py

@@ -546,7 +546,7 @@ def get_tree_mem_usage(memory_usage: MutableSequence[Optional[int]]) -> None:
             _logger.info(
                 "[job %s] Max memory used: %iMiB",
                 self.name,
-                round(memory_usage[0] / (2 ** 20)),
+                round(memory_usage[0] / (2**20)),
             )
         else:
             _logger.debug(
@@ -934,7 +934,7 @@ def docker_monitor(
         _logger.info(
             "[job %s] Max memory used: %iMiB",
             self.name,
-            int((max_mem_percent / 100 * max_mem) / (2 ** 20)),
+            int((max_mem_percent / 100 * max_mem) / (2**20)),
         )
         if cleanup_cidfile:
             os.remove(cidfile)

lint-requirements.txt

@@ -0,0 +1,2 @@
+flake8-bugbear
+black ~= 22.0

tox.ini

@@ -45,8 +45,7 @@ extras =
 deps =
   py3{7,8,9,10}-{unit,lint,bandit,mypy}: -rrequirements.txt
   py3{7,8,9,10}-{unit,mypy}: -rtest-requirements.txt
-  py3{7,8,9,10}-lint: flake8-bugbear
-  py3{7,8,9,10}-lint: black
+  py3{7,8,9,10}-lint: -rlint-requirements.txt
   py3{7,8,9,10}-bandit: bandit
   py3{7,8,9,10}-bandit: importlib_metadata != 4.8.0
   py3{7,8,9,10}-mypy: -rmypy-requirements.txt