Update to Black 22.3.0 (#723)

- A new version of Click broke Black. The new version of Black fixes the issue.
- New stable version of Black (22.1, 22.3) changes some of the code formatting.
- Targeting Python >=3.7 adds trailing comma after `**kwargs`.
- Strings prefixed by u are replaced by plain strings which are Unicode in Python 3.
- Changes applied to all files.
- Python 2 files are now ignored (to be fixed or removed in the future).
- CI workflow synced to core repo.
- See also OSGeo/grass#2212 for the update to stable Black in core repo.
- See also OSGeo/grass#2286 for the Click-related update.

.github/workflows/black.yml

@@ -1,26 +1,38 @@
 name: Python Black Formatting
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+    - grass*
+  pull_request:
 
 jobs:
   run-black:
-    name: Check
-    runs-on: ubuntu-20.04
+    name: Black ${{ matrix.black-version }}
+
+    # Using matrix just to get variables which are not environmental variables
+    # and also to sync with other workflows which use matrix.
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-20.04
+            python-version: "3.10"
+            black-version: "22.3.0"
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: ${{ matrix.python-version }}
 
       - name: Install
         run: |
           python -m pip install --upgrade pip
-          pip install black==21.5b1
+          pip install black==${{ matrix.black-version }}
 
       - name: Run Black
         run: |

pyproject.toml

@@ -1,5 +1,6 @@
 [tool.black]
 line-length = 88
+target-version = ['py37', 'py38', 'py39', 'py310']
 include = '\.pyi?$'
 exclude = '''
 (
@@ -17,5 +18,20 @@ exclude = '''
         | bin\..*
         | dist\..*
     )/
+    | src/hadoop/hd/dependency.py
+    | src/hadoop/hd/hd.hive.select/hd.hive.select.py
+    | src/hadoop/hd/hdfsgrass/hdfs_grass_util.py
+    | src/hadoop/hd/hdfswrapper/webhdfs_hook.py
+    | src/gui/wxpython/wx.rdigit/rdigit/main.py
+    | src/gui/wxpython/wx.stream/gui_modules/ImageViewer.py
+    | src/gui/wxpython/wx.stream/gui_modules/rstream_panelOne.py
+    | src/gui/wxpython/wx.wms/parse.py
+    | src/gui/wxpython/wx.wms/wmsmenu.py
+    | src/gui/wxpython/wx.wms/LoadConfig.py
+    | src/gui/wxpython/newgui/wxgui.py
+    | src/gui/wxpython/newgui/render2.py
+    | src/gui/wxpython/newgui/mapwindow.py
+    | src/gui/wxpython/newgui/frame.py
+    | src/raster/r.agent/tests/test_grassland.py
 )
 '''

src/display/d.vect.thematic2/d.vect.thematic2.py

@@ -1357,7 +1357,7 @@ def main():
                 icon=icon,
                 size=ptsize,
                 quiet=True,
-                **kwargs
+                **kwargs,
             )
 
             if themetype != "graduated_lines":

src/general/g.rename.many/g.rename.many.py

@@ -131,7 +131,7 @@ def map_exists(name, type, mapset=None):
         mapset=mapset,
         stdout=PIPE,
         stderr=PIPE,
-        **extra_params
+        **extra_params,
     )
     output, errors = process.communicate()
     info = parse_key_val(output)

src/gui/wxpython/newgui/api_test.py

@@ -79,7 +79,7 @@ def __init__(
         Map=Map(),
         auimgr=None,
         name=None,
-        **kwargs
+        **kwargs,
     ):
         """!
 
@@ -100,7 +100,7 @@ def __init__(
             style=style,
             auimgr=auimgr,
             name=name,
-            **kwargs
+            **kwargs,
         )
 
         self.Map = Map  # instance of render.Map
@@ -192,7 +192,7 @@ def __init__(
         | CT.TR_ROW_LINES
         | CT.TR_FULL_ROW_HIGHLIGHT
         | CT.TR_MULTIPLE,
-        **kwargs
+        **kwargs,
     ):
 
         wx.Panel.__init__(self, parent=parent, id=id, style=style)

src/gui/wxpython/wx.mwprecip/mw3.py

@@ -474,21 +474,24 @@ def createWin(self):
     def sumValues(self):
         ##summing values per (->user)timestep interval
         self.viewDB = "computed_precip_sum"
-        sql = "CREATE %s %s.%s as  \
+        sql = (
+            "CREATE %s %s.%s as  \
                SELECT %s ,round(avg(precip)::numeric,3) as %s, date_trunc('%s',time)as time  \
                FROM %s.%s \
                GROUP BY %s, date_trunc('%s',time)\
-               ORDER BY time" % (
-            self.viewStatement,
-            self.schema,
-            self.viewDB,
-            self.typeID,
-            self.database.precipColName,
-            self.sumStep,
-            self.schema,
-            self.tbName,
-            self.typeID,
-            self.sumStep,
+               ORDER BY time"
+            % (
+                self.viewStatement,
+                self.schema,
+                self.viewDB,
+                self.typeID,
+                self.database.precipColName,
+                self.sumStep,
+                self.schema,
+                self.tbName,
+                self.typeID,
+                self.sumStep,
+            )
         )
         self.database.connection.executeSql(sql, False, True)
 
@@ -560,17 +563,20 @@ def removeLinksOthers(self):
         sql = "DROP TABLE %s.linktmp " % self.schema
         self.database.connection.executeSql(sql, False, True)
 
-        sql = "DELETE FROM %s.%s WHERE NOT EXISTS\
+        sql = (
+            "DELETE FROM %s.%s WHERE NOT EXISTS\
               (SELECT %s FROM   %s.linktmp \
-               WHERE %s.%s.%s=linksonly.%s)" % (
-            self.schema,
-            self.viewDB,
-            self.typeID,
-            self.schema,
-            self.schema,
-            self.viewDB,
-            self.typeID,
-            self.typeID,
+               WHERE %s.%s.%s=linksonly.%s)"
+            % (
+                self.schema,
+                self.viewDB,
+                self.typeID,
+                self.schema,
+                self.schema,
+                self.viewDB,
+                self.typeID,
+                self.typeID,
+            )
         )
         self.database.connection.executeSql(sql, False, True)
 
@@ -612,15 +618,18 @@ def crateTimeWin(self):
                 tgrass = view_name + "|" + str(cur_timestamp) + "\n"
                 tgrass_vector.append(tgrass)
 
-            sql = "CREATE TABLE %s.%s as\
+            sql = (
+                "CREATE TABLE %s.%s as\
                    SELECT * from %s.%s \
-                   WHERE time=(timestamp'%s'+ %s * interval '1 second')" % (
-                self.schema,
-                view_name,
-                self.schema,
-                self.viewDB,
-                self.timestamp_min,
-                time_const,
+                   WHERE time=(timestamp'%s'+ %s * interval '1 second')"
+                % (
+                    self.schema,
+                    view_name,
+                    self.schema,
+                    self.viewDB,
+                    self.timestamp_min,
+                    time_const,
+                )
             )
 
             data = self.database.connection.executeSql(sql, False, True)
@@ -1158,15 +1167,18 @@ def checkValidity(freq, polarization):
                self.timeWin.timestamp_max)
         resu = self.database.connection.executeSql(sql, True, True)
         """
-        sql = "CREATE TABLE %s.record AS (SELECT linkid,time,txpower-rxpower as a \
+        sql = (
+            "CREATE TABLE %s.record AS (SELECT linkid,time,txpower-rxpower as a \
               FROM %s.record \
               WHERE time >= '%s' AND\
                     time <= '%s' \
-                    ORDER by recordid);" % (
-            self.database.schema,
-            self.database.dataSchema,
-            self.timeWin.timestamp_min,
-            self.timeWin.timestamp_max,
+                    ORDER by recordid);"
+            % (
+                self.database.schema,
+                self.database.dataSchema,
+                self.timeWin.timestamp_min,
+                self.timeWin.timestamp_max,
+            )
         )
         self.database.connection.executeSql(sql, False, True)
 

src/gui/wxpython/wx.rdigit/frame.py

@@ -57,7 +57,7 @@ def __init__(
         toolbars=["digitMap", "rdigit"],
         size=(875, 600),
         name="RDigitWindow",
-        **kwargs
+        **kwargs,
     ):
         """!
         @param parent (no parent is expected)

src/gui/wxpython/wx.rdigit/rdigit/dialogs_core.py

@@ -43,7 +43,7 @@ def __init__(
         disableAdd=False,
         showType=False,
         style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER,
-        *kwargs
+        *kwargs,
     ):
         """!Dialog for creating new vector map
 

src/gui/wxpython/wx.rdigit/rdigit/mapwindow.py

@@ -43,7 +43,7 @@ def __init__(
         tree=None,
         lmgr=None,
         style=wx.NO_FULL_REPAINT_ON_RESIZE,
-        **kwargs
+        **kwargs,
     ):
         BufferedWindow.__init__(
             self,
@@ -54,7 +54,7 @@ def __init__(
             frame=frame,
             tree=tree,
             style=style,
-            **kwargs
+            **kwargs,
         )
         self.lmgr = lmgr
         self.pdcVector = wx.PseudoDC()

src/gui/wxpython/wx.stream/gui_modules/rstream.py

@@ -73,7 +73,7 @@ def __init__(
         id=wx.ID_ANY,
         style=wx.DEFAULT_FRAME_STYLE | wx.RESIZE_BORDER,
         title=_("GRASS GIS Hydrological Modelling Utility"),
-        **kwargs
+        **kwargs,
     ):
         """!Main window of r.stream's GUI
 
@@ -92,7 +92,7 @@ def __init__(
             title=title,
             name="RStream",
             size=(600, 900),
-            **kwargs
+            **kwargs,
         )
         self.SetIcon(
             wx.Icon(os.path.join(globalvar.ETCICONDIR, "grass.ico"), wx.BITMAP_TYPE_ICO)

src/imagery/i.ann.maskrcnn/maskrcnnlib/model.py

@@ -1134,7 +1134,7 @@ def smooth_l1_loss(y_true, y_pred):
     """
     diff = K.abs(y_true - y_pred)
     less_than_one = K.cast(K.less(diff, 1.0), "float32")
-    loss = (less_than_one * 0.5 * diff ** 2) + (1 - less_than_one) * (diff - 0.5)
+    loss = (less_than_one * 0.5 * diff**2) + (1 - less_than_one) * (diff - 0.5)
     return loss
 
 
@@ -2067,7 +2067,7 @@ def build(self, mode, config):
 
         # Image size must be dividable by 2 multiple times
         h, w = config.IMAGE_SHAPE[:2]
-        if h / 2 ** 6 != int(h / 2 ** 6) or w / 2 ** 6 != int(w / 2 ** 6):
+        if h / 2**6 != int(h / 2**6) or w / 2**6 != int(w / 2**6):
             raise Exception(
                 "Image size must be dividable by 2 at least 6 times "
                 "to avoid fractions when downscaling and upscaling."

src/imagery/i.cutlines/i.cutlines.py

@@ -268,7 +268,7 @@ def main():
                 overlap=overlap,
                 processes=processes,
                 split=False,
-                **kwargs
+                **kwargs,
             )
             grd.run()
         else:
@@ -299,7 +299,7 @@ def main():
                 processes=processes,
                 split=False,
                 flags="n",
-                **kwargs
+                **kwargs,
             )
             grd.run()
         else:

src/imagery/i.gabor/i.gabor.py

@@ -124,7 +124,7 @@ def gabor2d(win_size, orientation=0, wavelength=5, aspect=0.5, offset=0, ntype="
     xr = x * np.cos(orientation) + y * np.sin(orientation)
     yr = -x * np.sin(orientation) + y * np.cos(orientation)
 
-    gaussian = np.exp(-((xr ** 2 + aspect ** 2 * yr ** 2) / (2 * stddev ** 2)))
+    gaussian = np.exp(-((xr**2 + aspect**2 * yr**2) / (2 * stddev**2)))
     if ntype == "imag":
         sf = np.sin(2 * np.pi * xr / wavelength + offset)
     else:
@@ -162,7 +162,7 @@ def main():
     if flags["q"]:
         if not threshold:
             grass.fatal(_("A percentile threshold is needed to quantify."))
-        q = [2 ** i for i in range(len(orientation))]
+        q = [2**i for i in range(len(orientation))]
     else:
         q = 0
 

src/imagery/i.landsat8.swlst/randomness.py

@@ -9,7 +9,7 @@ def random_digital_numbers(count=2):
     digital_numbers = []
 
     for dn in range(0, count):
-        digital_numbers.append(random.randint(1, 2 ** 12))
+        digital_numbers.append(random.randint(1, 2**12))
 
     if count == 1:
         return digital_numbers[0]

src/imagery/i.landsat8.swlst/split_window_lst.py

@@ -381,10 +381,10 @@ def compute_lst(self, t10, t11, coefficients):
 
         # addends
         a = b0
-        b1 = b1 + b2 * (1 - avg) / avg + b3 * delta / avg ** 2
+        b1 = b1 + b2 * (1 - avg) / avg + b3 * delta / avg**2
         b2 = (t10 + t11) / 2
         b = b1 * b2
-        c1 = b4 + b5 * (1 - avg) / avg + b6 * delta / avg ** 2
+        c1 = b4 + b5 * (1 - avg) / avg + b6 * delta / avg**2
         c2 = (t10 - t11) / 2
         c = c1 * c2
         d = b7 * (t10 - t11) ** 2

src/imagery/i.nightlights.intercalibration/intercalibration_models.py

@@ -210,7 +210,7 @@ def calibrate(self, dn):
         build a calibration equation for the requested satellite and year.
         """
         if self.is_dn_valid(dn):
-            cdn = self.c0 + (self.c1 * dn) + (self.c2 * (dn ** 2))
+            cdn = self.c0 + (self.c1 * dn) + (self.c2 * (dn**2))
         model = EQUATIONS[self.author].model  # look in equations.py
         self._model = model.format(dn=dn, cdn=cdn, c0=self.c0, c1=self.c1, c2=self.c2)
         return cdn
@@ -289,7 +289,7 @@ def calibrate(self, dn):
         build a calibration equation for the requested satellite and year.
         """
         if self.is_dn_valid(dn):
-            cdn = self.c0 + (self.c1 * dn) + (self.c2 * (dn ** 2))
+            cdn = self.c0 + (self.c1 * dn) + (self.c2 * (dn**2))
 
         # Update _model as well!
         model = "{cdn} = ({c0}) + ({c1}) * {dn} + ({c2}) * {dn}^2"

src/imagery/i.nightlights.intercalibration/test_intercalibration_models.py

@@ -45,7 +45,7 @@ def calibrate_digital_number(dn, c0, c1, c2):
             "The provided Digital Number value is out of the " "expected range [0, 63]"
         )
 
-    return c0 + (c1 * dn) + (c2 * (dn ** 2))
+    return c0 + (c1 * dn) + (c2 * (dn**2))
 
 
 def test_model(author):