Reformat with new black update

And bump mypy and fix some related CI

.github/workflows/ci.yml

@@ -16,8 +16,10 @@ jobs:
           LIBDRM: 2.4.109
         strategy:
             matrix:
-                # if you change one of these, be sure to update
-                # /tox.ini:[gh-actions] as well
+                # If you change one of these, be sure to update:
+                # - /tox.ini:[gh-actions]
+                # - /setup.cfg:[mypy]
+                # - /libqtile/scripts/check.py mypy argument
                 python-version: [pypy-3.7, 3.7, 3.8, 3.9, '3.10']
         steps:
             - uses: actions/checkout@v2

libqtile/backend/x11/window.py

@@ -379,7 +379,7 @@ def get_property(self, prop, type=None, unpack=None):
                 self.conn.atoms[prop] if isinstance(prop, str) else prop,
                 self.conn.atoms[type] if isinstance(type, str) else type,
                 0,
-                (2 ** 32) - 1,
+                (2**32) - 1,
             ).reply()
         except (xcffib.xproto.WindowError, xcffib.xproto.AccessError):
             logger.debug("X error in GetProperty (wid=%r, prop=%r), ignoring", self.wid, prop)

libqtile/command/client.py

@@ -44,8 +44,8 @@
 if TYPE_CHECKING:
     from typing import Any, List, Tuple
 
-    from libqtile.command.interface import SelectorType
     from libqtile.command.graph import GraphType
+    from libqtile.command.interface import SelectorType
 
 
 class CommandClient:

libqtile/command/graph.py

@@ -26,10 +26,10 @@
 from __future__ import annotations
 
 import abc
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Union
 
 if TYPE_CHECKING:
-    from typing import Dict, List, Optional, Tuple, Type, Union
+    from typing import Dict, List, Optional, Tuple, Type
 
     SelectorType = Tuple[str, Optional[str | int]]
 

libqtile/layout/tree.py

@@ -32,7 +32,7 @@
 from libqtile import hook
 from libqtile.layout.base import Layout
 
-to_superscript = dict(zip(map(ord, u"0123456789"), map(ord, u"⁰¹²³⁴⁵⁶⁷⁸⁹")))
+to_superscript = dict(zip(map(ord, "0123456789"), map(ord, "⁰¹²³⁴⁵⁶⁷⁸⁹")))
 
 
 class TreeNode:

libqtile/lazy.py

@@ -28,8 +28,8 @@
 if TYPE_CHECKING:
     from typing import Dict, Iterable, List, Set, Tuple
 
-    from libqtile.config import Match
     from libqtile.command.graph import SelectorType
+    from libqtile.config import Match
 
 
 class LazyCall:

libqtile/scripts/check.py

@@ -98,7 +98,7 @@ def type_check_config_args(config_file):
     try:
         # we want to use Literal, which is in 3.8. If people have a mypy that
         # is too old, they can upgrade; this is an optional check anyways.
-        subprocess.check_call(["mypy", "--python-version=3.8", config_file])
+        subprocess.check_call(["mypy", "--python-version=3.10", config_file])
         print("config file type checking succeeded")
     except subprocess.CalledProcessError as e:
         print("config file type checking failed: {}".format(e))

libqtile/scripts/main.py

@@ -7,7 +7,7 @@
 
 try:
     # Python>3.7 can get the version from importlib
-    from importlib.metadata import distribution  # type: ignore
+    from importlib.metadata import distribution
 
     VERSION = distribution("qtile").version
 except ModuleNotFoundError:

libqtile/widget/base.py

@@ -68,6 +68,8 @@
 # | ORIENTATION_BOTH       | Widget displayed   | Widget displayed   |
 # |                        | horizontally       | vertically         |
 # +------------------------+--------------------+--------------------+
+
+
 class _Orientations(int):
     def __new__(cls, value, doc):
         return super().__new__(cls, value)

libqtile/widget/net.py

@@ -95,7 +95,7 @@ def convert_b(self, num_bytes: float) -> Tuple[float, str]:
         else:
             power = self.allowed_prefixes.index(self.prefix)
 
-        converted_bytes = num_bytes / self.factor ** power
+        converted_bytes = num_bytes / self.factor**power
         unit = self.units[power]
 
         return converted_bytes, unit

libqtile/widget/statusnotifier.py

@@ -21,6 +21,7 @@
 import asyncio
 import os
 from functools import partial
+
 # dbus_next is incompatible with deferred type evaluation
 from typing import Callable, List, Optional
 

libqtile/widget/systray.py

@@ -36,7 +36,6 @@
 from libqtile.confreader import ConfigError
 from libqtile.widget import base
 
-
 XEMBED_PROTOCOL_VERSION = 0
 
 

libqtile/widget/volume.py

@@ -148,13 +148,13 @@ def _update_drawer(self):
             self.drawer.ctx.paint()
         elif self.emoji:
             if self.volume <= 0:
-                self.text = u"\U0001f507"
+                self.text = "\U0001f507"
             elif self.volume <= 30:
-                self.text = u"\U0001f508"
+                self.text = "\U0001f508"
             elif self.volume < 80:
-                self.text = u"\U0001f509"
+                self.text = "\U0001f509"
             elif self.volume >= 80:
-                self.text = u"\U0001f50a"
+                self.text = "\U0001f50a"
         else:
             if self.volume == -1:
                 self.text = "M"

setup.cfg

@@ -109,10 +109,11 @@ balanced_wrapping = true
 default_section = THIRDPARTY
 known_first_party = libqtile,test
 include_trailing_comma = true
+profile = black
 
 [mypy]
 mypy_path = stubs
-python_version = 3.7
+python_version = 3.10
 warn_unused_configs = True
 warn_unused_ignores = True
 warn_unreachable = True

test/backend/x11/test_window.py

@@ -751,7 +751,7 @@ def test_net_frame_extents(xmanager):
 
     def assert_frame(wid, frame):
         r = conn.conn.core.GetProperty(
-            False, wid, conn.atoms["_NET_FRAME_EXTENTS"], conn.atoms["CARDINAL"], 0, (2 ** 32) - 1
+            False, wid, conn.atoms["_NET_FRAME_EXTENTS"], conn.atoms["CARDINAL"], 0, (2**32) - 1
         ).reply()
         assert r.value.to_atoms() == frame
 

tox.ini

@@ -58,7 +58,7 @@ commands =
 [testenv:pep8]
 deps =
     flake8
-    flake8-black
+    flake8-black>=0.2.4
     flake8-isort
     flake8-tidy-imports
     pep8-naming
@@ -81,7 +81,7 @@ commands =
 
 [testenv:mypy]
 deps =
-    mypy == 0.930
+    mypy == 0.931
     bowler
     dbus-next
     xcffib >= 0.10.1