Update black version requirement and apply latest version to source (…

…#514)

* Change black version specification

* Apply updated black version to source

* Update black version in workflow

* Resolve CI failure on macos

* Apply updated black version to source

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Black code formatter
         uses: psf/black@stable
         with:
-          version: "22.3"
+          version: ">=24.3.0"
       - name: Isort import sorter
         uses: isort/isort-action@v1
       - name: Pylint code analysis

.github/workflows/pytest_macos.yml

@@ -13,7 +13,7 @@ on:
 jobs:
 
   test:
-    runs-on: macos-latest
+    runs-on: macos-13
     strategy:
       fail-fast: false
       matrix:

dev_requirements.txt

@@ -4,6 +4,6 @@ pytest>=7.3.0
 pytest-split
 packaging
 pre-commit
-black>=22.3,<23
+black>=24.3.0
 isort
 autoflake

docs/source/conf/25-napoleon.py

@@ -26,6 +26,7 @@ def parse_class_attributes_section(self, section):
 
 GoogleDocstring._parse_class_attributes_section = parse_class_attributes_section
 
+
 # we now patch the parse method to guarantee that the the above methods are
 # assigned to the _section dict
 def patched_parse(self):

examples/scripts/sparsecode_poisson_apgm.py

@@ -70,7 +70,6 @@
 
 # Define composed operator.
 class ForwardOperator(Operator):
-
     """Toy problem non-linear forward operator with different treatment
        of x[0] and x[1].
 

scico/flax/inverse.py

@@ -336,6 +336,7 @@ class ODPGrDescBlock(Module):
         alpha_ini: Initial value of the fidelity weight `alpha`.
         dtype: Output dtype. Default: :attr:`~numpy.float32`.
     """
+
     operator: ModuleDef
     depth: int
     channels: int

scico/functional/_norm.py

@@ -409,9 +409,7 @@ def __init__(self, delta: float = 1.0, separable: bool = True):
 
     def _call_sep(self, x: Union[Array, BlockArray]) -> float:
         xabs = snp.abs(x)
-        hx = snp.where(
-            xabs <= self.delta, 0.5 * xabs**2, self.delta * (xabs - (self.delta / 2.0))
-        )
+        hx = snp.where(xabs <= self.delta, 0.5 * xabs**2, self.delta * (xabs - (self.delta / 2.0)))
         return snp.sum(hx)
 
     def _call_nonsep(self, x: Union[Array, BlockArray]) -> float:

scico/linop/xray/astra.py

@@ -190,6 +190,7 @@ def fbp(self, sino: jax.Array, filter_type: str = "Ram-Lak") -> jax.Array:
                see `cfg.FilterType` in the `ASTRA documentation
                <https://www.astra-toolbox.com/docs/algs/FBP_CUDA.html>`__.
         """
+
         # Just use the CPU FBP alg for now; hitting memory issues with GPU one.
         def f(sino):
             sino = _ensure_writeable(sino)

scico/numpy/_blockarray.py

@@ -169,6 +169,7 @@ def prop_ba(self):
 for prop_name in da_props:
     setattr(BlockArray, prop_name, _da_prop_wrapper(prop_name))
 
+
 # Wrap jax array methods.
 def _da_method_wrapper(method_name):
     method = getattr(Array, method_name)

scico/optimize/_admmaux.py

@@ -771,7 +771,9 @@ def compute_rhs(self) -> Union[Array, BlockArray]:
         C0 = self.admm.C_list[0]
         rhs = snp.zeros(C0.input_shape, C0.input_dtype)
         omega = self.admm.g_list[0].scale
-        omega_list = [2.0 * omega,] + [
+        omega_list = [
+            2.0 * omega,
+        ] + [
             1.0,
         ] * (len(self.admm.C_list) - 1)
         for omegai, rhoi, Ci, zi, ui in zip(

scico/test/flax/test_clu.py

@@ -86,6 +86,7 @@ def test_count_parameters_empty():
 +--------------------+--------------+------+------+-----+
 Total weights: 56"""
 
+
 # From https://github.com/google/CommonLoopUtils/blob/main/clu/parameter_overview_test.py
 def test_get_parameter_overview_empty():
     assert get_parameter_overview({}) == EMPTY_PARAMETER_OVERVIEW

scico/test/linop/test_conversions.py

@@ -1,6 +1,7 @@
 """
 Test methods that make one kind of Operator out of another.
 """
+
 import numpy as np
 
 import pytest