beeware · freakboy3742 · Feb 6, 2023 · Feb 5, 2023 · Feb 5, 2023 · Feb 5, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4.5.0
         with:
-          python-version: ${{ env.min_python_version }}
+          python-version: "3.X"
       - uses: pre-commit/action@v3.0.0
 
   towncrier:
@@ -37,7 +37,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-python@v4.5.0
       with:
-        python-version: ${{ env.min_python_version }}
+        python-version: "3.X"
     - name: Install dev dependencies
       run: |
         # We don't actually want to install toga-core;

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 exclude: "^(attic|examples/.template|nursery)/"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: check-toml
       - id: check-yaml
@@ -10,29 +10,20 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/PyCQA/isort
-    # For split_on_trailing_comma. Should be in the release after 5.10.1
-    rev: 12cc5fbd67eebf92eb2213b03c07b138ae1fb448
+    rev: 5.12.0
     hooks:
       - id: isort
         additional_dependencies: [toml]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.0
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args: [--py37-plus]
-  # Docformatter is RST-unaware, and may break markup by inserting or removing newlines
-  # (see https://github.com/PyCQA/docformatter/issues/124 and linked issues). Until this
-  # is fixed, it's not safe to run it automatically.
-  # - repo: https://github.com/myint/docformatter
-  #   rev: v1.5.0
-  #   hooks:
-  #   - id: docformatter
-  #     args: [--in-place]
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 23.1.0
     hooks:
     - id: black
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+    rev: 6.0.0
     hooks:
       - id: flake8
diff --git a/changes/1770.misc.rst b/changes/1770.misc.rst
@@ -0,0 +1 @@
+Updated ``pre-commit`` hooks to the latest version.
diff --git a/cocoa/src/toga_cocoa/app.py b/cocoa/src/toga_cocoa/app.py
@@ -48,7 +48,6 @@ def cocoa_windowShouldClose(self):
 
 
 class AppDelegate(NSObject):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/documents.py b/cocoa/src/toga_cocoa/documents.py
@@ -4,7 +4,6 @@
 
 
 class TogaDocument(NSDocument):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/base.py b/cocoa/src/toga_cocoa/widgets/base.py
@@ -98,7 +98,6 @@ def set_tab_index(self, tab_index):
     # INTERFACE
 
     def add_child(self, child):
-
         if self.viewport:
             # we are the the top level NSView
             child.container = self

diff --git a/cocoa/src/toga_cocoa/widgets/button.py b/cocoa/src/toga_cocoa/widgets/button.py
@@ -16,7 +16,6 @@
 
 
 class TogaButton(NSButton):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/canvas.py b/cocoa/src/toga_cocoa/widgets/canvas.py
@@ -27,7 +27,6 @@
 
 
 class TogaCanvas(NSView):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/detailedlist.py b/cocoa/src/toga_cocoa/widgets/detailedlist.py
@@ -27,7 +27,6 @@ def attr_impl(value, attr):
 
 
 class TogaList(NSTableView):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/internal/cells.py b/cocoa/src/toga_cocoa/widgets/internal/cells.py
@@ -120,7 +120,6 @@ def setup(self):
 
     @objc_method
     def setImage_(self, image):
-
         if not self.imageView:
             self.setup()
 
@@ -139,7 +138,6 @@ def setImage_(self, image):
 
     @objc_method
     def setText_(self, text):
-
         if not self.imageView:
             self.setup()
 

diff --git a/cocoa/src/toga_cocoa/widgets/internal/refresh.py b/cocoa/src/toga_cocoa/widgets/internal/refresh.py
@@ -35,7 +35,6 @@
 
 
 class RefreshableClipView(NSClipView):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 
@@ -73,7 +72,6 @@ def documentRect(self) -> NSRect:
 
 
 class RefreshableScrollView(NSScrollView):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/numberinput.py b/cocoa/src/toga_cocoa/widgets/numberinput.py
@@ -26,7 +26,6 @@
 
 
 class TogaStepper(NSStepper):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/optioncontainer.py b/cocoa/src/toga_cocoa/widgets/optioncontainer.py
@@ -6,7 +6,6 @@
 
 
 class TogaTabViewDelegate(NSObject):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/passwordinput.py b/cocoa/src/toga_cocoa/widgets/passwordinput.py
@@ -3,7 +3,6 @@
 
 
 class TogaSecureTextField(NSSecureTextField):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/selection.py b/cocoa/src/toga_cocoa/widgets/selection.py
@@ -6,7 +6,6 @@
 
 
 class TogaPopupButton(NSPopUpButton):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/slider.py b/cocoa/src/toga_cocoa/widgets/slider.py
@@ -12,7 +12,6 @@
 
 
 class TogaSlider(NSSlider):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/splitcontainer.py b/cocoa/src/toga_cocoa/widgets/splitcontainer.py
@@ -6,7 +6,6 @@
 
 
 class TogaSplitViewDelegate(NSObject):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/switch.py b/cocoa/src/toga_cocoa/widgets/switch.py
@@ -15,7 +15,6 @@
 
 
 class TogaSwitch(NSButton):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/table.py b/cocoa/src/toga_cocoa/widgets/table.py
@@ -21,7 +21,6 @@
 
 
 class TogaTable(NSTableView):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 
@@ -155,7 +154,6 @@ def onDoubleClick_(self, sender) -> None:
 
 class Table(Widget):
     def create(self):
-
         self._view_for_row = dict()
 
         # Create a table view, and put it in a scroll view.

diff --git a/cocoa/src/toga_cocoa/widgets/textinput.py b/cocoa/src/toga_cocoa/widgets/textinput.py
@@ -15,7 +15,6 @@
 
 
 class TogaTextField(NSTextField):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/cocoa/src/toga_cocoa/widgets/tree.py b/cocoa/src/toga_cocoa/widgets/tree.py
@@ -26,7 +26,6 @@
 
 
 class TogaTree(NSOutlineView):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 
@@ -73,7 +72,6 @@ def outlineView_numberOfChildrenOfItem_(self, tree, item) -> int:
 
     @objc_method
     def outlineView_viewForTableColumn_item_(self, tree, column, item):
-
         col_identifier = str(column.identifier)
 
         try:
@@ -133,7 +131,6 @@ def outlineView_viewForTableColumn_item_(self, tree, column, item):
 
     @objc_method
     def outlineView_heightOfRowByItem_(self, tree, item) -> float:
-
         default_row_height = self.rowHeight
 
         if item is self:
@@ -229,7 +226,6 @@ def create(self):
         for i, (heading, accessor) in enumerate(
             zip(self.interface.headings, self.interface._accessors)
         ):
-
             column_identifier = at(accessor)
             self.column_identifiers[id(column_identifier)] = accessor
             column = NSTableColumn.alloc().initWithIdentifier(column_identifier)

diff --git a/cocoa/src/toga_cocoa/widgets/webview.py b/cocoa/src/toga_cocoa/widgets/webview.py
@@ -98,7 +98,6 @@ async def evaluate_javascript(self, javascript):
         future = loop.create_future()
 
         def completion_handler(res: objc_id, error: objc_id) -> None:
-
             if error:
                 error = py_from_ns(error)
                 exc = RuntimeError(str(error))

diff --git a/cocoa/src/toga_cocoa/window.py b/cocoa/src/toga_cocoa/window.py
@@ -49,7 +49,6 @@ def height(self):
 
 
 class WindowDelegate(NSObject):
-
     interface = objc_property(object, weak=True)
     impl = objc_property(object, weak=True)
 

diff --git a/core/src/toga/command.py b/core/src/toga/command.py
@@ -29,7 +29,6 @@ def __init__(
         parent=None,
         label=None,  # DEPRECATED!
     ):
-
         ##################################################################
         # 2022-07: Backwards compatibility
         ##################################################################

diff --git a/core/src/toga/style/pack.py b/core/src/toga/style/pack.py
@@ -123,7 +123,6 @@ def apply(self, prop, value):
                 )
 
     def layout(self, node, viewport):
-
         # Precompute `scale_factor` by providing it as a default param.
         def scale(value, scale_factor=viewport.dpi / viewport.baseline_dpi):
             return int(value * scale_factor)

diff --git a/core/src/toga/validators.py b/core/src/toga/validators.py
@@ -338,7 +338,6 @@ def count(self, input_string: str):
 
 
 class Integer(MatchRegex):
-
     INTEGER_REGEX = r"^\d+$"
 
     def __init__(self, error_message: Optional[str] = None, allow_empty: bool = True):
@@ -350,7 +349,6 @@ def __init__(self, error_message: Optional[str] = None, allow_empty: bool = True
 
 
 class Number(MatchRegex):
-
     NUMBER_REGEX = r"^[-+]?(\d+\.|\d*\.?\d+)([eE][-+]?\d+)?$"
 
     def __init__(self, error_message: Optional[str] = None, allow_empty: bool = True):
@@ -362,7 +360,6 @@ def __init__(self, error_message: Optional[str] = None, allow_empty: bool = True
 
 
 class Email(MatchRegex):
-
     EMAIL_REGEX = (
         r"^[a-zA-Z][a-zA-Z0-9\.]*[a-zA-Z0-9]@[a-zA-Z][a-zA-Z0-9]*(\.[a-zA-Z0-9]+)+$"
     )

diff --git a/core/src/toga/widgets/base.py b/core/src/toga/widgets/base.py
@@ -115,7 +115,6 @@ def add(self, *children):
         """
         for child in children:
             if child.parent is not self:
-
                 # remove from old parent
                 if child.parent:
                     child.parent.remove(child)
@@ -146,7 +145,6 @@ def insert(self, index, child):
         :param child: The child to insert as a child of this node.
         """
         if child.parent is not self:
-
             # remove from old parent
             if child.parent:
                 child.parent.remove(child)

diff --git a/core/src/toga/widgets/canvas.py b/core/src/toga/widgets/canvas.py
@@ -523,7 +523,6 @@ def __init__(
         on_alt_drag=None,
         factory=None,  # DEPRECATED!
     ):
-
         super().__init__(id=id, style=style)
         ######################################################################
         # 2022-09: Backwards compatibility

diff --git a/core/src/toga/widgets/imageview.py b/core/src/toga/widgets/imageview.py
@@ -44,7 +44,6 @@ def image(self):
 
     @image.setter
     def image(self, image):
-
         if isinstance(image, str):
             self._image = Image(image)
         else:

diff --git a/core/src/toga/window.py b/core/src/toga/window.py
@@ -38,7 +38,6 @@ def __init__(
         factory=None,  # DEPRECATED !
         on_close=None,
     ):
-
         ######################################################################
         # 2022-09: Backwards compatibility
         ######################################################################
@@ -145,7 +144,6 @@ def content(self):
 
     @content.setter
     def content(self, widget):
-
         # Set window of old content to None
         if self._content:
             self._content.window = None

diff --git a/core/tests/test_window.py b/core/tests/test_window.py
@@ -123,7 +123,6 @@ def test_set_app_after_content(self):
         self.assertEqual(content.app, self.app)
 
     def test_set_app_adds_window_widgets_to_app(self):
-
         id0, id1, id2, id3 = "id0", "id1", "id2", "id3"
         widget1, widget2, widget3 = (
             toga.Label(id=id1, text="label 1"),

diff --git a/core/tests/widgets/test_scrollcontainer.py b/core/tests/widgets/test_scrollcontainer.py
@@ -89,7 +89,6 @@ def test_set_vertical_position_when_unset_raises_an_error(self):
             self.sc.vertical_position = 0.5
 
     def test_set_app(self):
-
         new_content = toga.Box(style=TestStyle())
         self.sc.content = new_content
         self.assertIsNone(new_content.app)

diff --git a/core/tests/widgets/test_table.py b/core/tests/widgets/test_table.py
@@ -131,7 +131,6 @@ def test_add_column(self):
         self.assertEqual(self.table.headings, expecting_headings)
 
     def test_add_columns_accessor_in_use(self):
-
         new_heading = "Heading 4"
         accessor = "heading_2"
 

diff --git a/examples/activityindicator/activityindicator/app.py b/examples/activityindicator/activityindicator/app.py
@@ -6,7 +6,6 @@
 class ExampleActivityIndicatorApp(toga.App):
     # Button callback functions
     def do_stuff(self, widget, **kwargs):
-
         if self.spinner.is_running:
             self.spinner.stop()
             self.button.text = "Start"