Use ruff instead of flake8

And remove py2-style type annotations, which ruff doesn't recognise

pyproject.toml

@@ -80,7 +80,7 @@ dependencies = [
 dev = [
     "black==22.3.0",
     "coverage~=5.5",
-    "flake8==3.9.0",
+    "ruff==0.0.262",
     "isort~=5.0",
     "mypy==0.812",
     "mypy-zope==0.3.0",
@@ -90,6 +90,8 @@ dev = [
     "typing-extensions>=3.7.4",
 ]
 
+[tool.ruff]
+line-length = 88
 
 [project.urls]
 homepage = "https://github.com/matrix-org/sygnal"

scripts-dev/lint.sh

@@ -3,7 +3,7 @@
 # Runs linting scripts over the local Sygnal checkout
 # isort - sorts import statements
 # black - opinionated code formatter
-# flake8 - lints and finds mistakes
+# ruff - lints and finds mistakes
 # mypy - type checker
 
 set -e
@@ -97,5 +97,5 @@ set -x
 
 isort "${files[@]}"
 python3 -m black "${files[@]}"
-flake8 "${files[@]}"
+ruff "${files[@]}"
 mypy "${files[@]}"

setup.cfg

@@ -1,14 +1,4 @@
-[flake8]
-# line length defaulted to by black
-max-line-length = 88
 
-# see https://pycodestyle.readthedocs.io/en/latest/intro.html#error-codes
-# for error codes. The ones we ignore are:
-#  W503: line break before binary operator
-#  W504: line break after binary operator
-#  E203: whitespace before ':' (which is contrary to pep8?)
-# (this is a subset of those ignored in Synapse)
-ignore=W503,W504,E203
 
 [isort]
 line_length = 88

sygnal/helper/proxy/proxyagent_twisted.py

@@ -80,9 +80,9 @@ def __init__(
             parsed_url = decompose_http_proxy_url(proxy_url_str)
             self._proxy_auth = parsed_url.credentials
 
-            self.proxy_endpoint = HostnameEndpoint(
+            self.proxy_endpoint: Optional[HostnameEndpoint] = HostnameEndpoint(
                 reactor, parsed_url.hostname, parsed_url.port, **self._endpoint_kwargs
-            )  # type: Optional[HostnameEndpoint]
+            )
         else:
             self.proxy_endpoint = None
 
@@ -124,11 +124,12 @@ def request(self, method, uri, headers=None, bodyProducer=None):
         pool_key: tuple = (parsed_uri.scheme, parsed_uri.host, parsed_uri.port)
         request_path = parsed_uri.originForm
 
+        endpoint: IStreamClientEndpoint
         if parsed_uri.scheme == b"http" and self.proxy_endpoint:
             # Cache *all* connections under the same key, since we are only
             # connecting to a single destination, the proxy:
             pool_key = ("http-proxy", self.proxy_endpoint)
-            endpoint = self.proxy_endpoint  # type: IStreamClientEndpoint
+            endpoint = self.proxy_endpoint
             request_path = uri
         elif parsed_uri.scheme == b"https" and self.proxy_endpoint:
             endpoint = HTTPConnectProxyEndpoint(

tests/testutils.py

@@ -337,6 +337,6 @@ def process_request(self, method: bytes, request_path: bytes, content: BinaryIO)
         """pretend that a request has arrived, and process it"""
 
         # this is normally done by HTTPChannel, in its various lineReceived etc methods
-        req = self.site.requestFactory(self)  # type: Request
+        req: Request = self.site.requestFactory(self)
         req.content = content
         req.requestReceived(method, request_path, b"1.1")

tox.ini

@@ -23,7 +23,7 @@ commands =
 [testenv:check_codestyle]
 
 commands =
-  flake8 sygnal/ tests/
+  ruff sygnal/ tests/
   black --check --diff sygnal/ tests/
   isort --check-only --diff sygnal/ tests/