update flake8 and pre-commit

Author: blink1073

.github/workflows/main.yml

@@ -122,7 +122,8 @@ jobs:
       - name: Install miniumum versions
         uses: jupyterlab/maintainer-tools/.github/actions/install-minimums@v1
       - name: Run the unit tests
-        env: PYTHONWARNINGS=default
+        env:
+          PYTHONWARNINGS: default
         run: pytest -vv jupyter_client || pytest -vv jupyter_client --lf
 
   test_prereleases:

.mailmap

@@ -26,7 +26,7 @@ David Hirschfeld <[email protected]> dhirschfeld <david.hirschfeld
 David P. Sanders <[email protected]> David P. Sanders <[email protected]>
 David Warde-Farley <[email protected]> David Warde-Farley <>
 Doug Blank <[email protected]> Doug Blank <[email protected]>
-Eugene Van den Bulke <[email protected]> Eugene Van den Bulke <[email protected]> 
+Eugene Van den Bulke <[email protected]> Eugene Van den Bulke <[email protected]>
 Evan Patterson <[email protected]> <[email protected]>
 Evan Patterson <[email protected]> <[email protected]>
 Evan Patterson <[email protected]> <[email protected]>

.pre-commit-config.yaml

@@ -1,25 +1,55 @@
+ci:
+  skip: [check-jsonschema]
+
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+      - id: end-of-file-fixer
+      - id: check-case-conflict
+      - id: check-executables-have-shebangs
+      - id: requirements-txt-fixer
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: check-toml
+      - id: check-yaml
+      - id: debug-statements
+      - id: forbid-new-submodules
+      - id: check-builtin-literals
+      - id: trailing-whitespace
+
   - repo: https://github.com/asottile/reorder_python_imports
     rev: v2.7.1
     hooks:
       - id: reorder-python-imports
+
   - repo: https://github.com/psf/black
     rev: 22.1.0
     hooks:
       - id: black
         args: ["--line-length", "100"]
+
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v2.5.1
     hooks:
       - id: prettier
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: "3.9.2"
+
+  - repo: https://github.com/pycqa/flake8
+    rev: 4.0.1
     hooks:
       - id: flake8
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+        additional_dependencies:
+          [
+            "flake8-bugbear==20.1.4",
+            "flake8-logging-format==0.6.0",
+            "flake8-implicit-str-concat==0.2.0",
+          ]
+
+  - repo: https://github.com/sirosen/check-jsonschema
+    rev: 0.14.1
     hooks:
-      - id: end-of-file-fixer
-      - id: check-case-conflict
-      - id: check-executables-have-shebangs
-      - id: requirements-txt-fixer
+      - id: check-jsonschema
+        name: "Check GitHub Workflows"
+        files: ^\.github/workflows/
+        types: [yaml]
+        args: ["--schemafile", "https://json.schemastore.org/github-workflow"]

docs/messaging.rst

@@ -73,7 +73,7 @@ kernel has dedicated sockets for the following functions:
    appropriately.
 
 4. **Control**: This channel is identical to Shell, but operates on a separate
-   socket to avoid queueing behind execution requests. The control channel is 
+   socket to avoid queueing behind execution requests. The control channel is
    used for shutdown and restart messages, as well as for debugging messages.
 
    For a smoother user experience, we recommend running the control channel in
@@ -1176,7 +1176,7 @@ In order to support page reloading, or a client connecting at a later stage, Jup
               ],
               'stoppedThreads' : list(int),  # threads in which the debugger is currently in a stopped state
               'richRendering' : bool,  # whether the debugger supports rich rendering of variables
-              'exceptionPaths' : list(str),  # exception names used to match leaves or nodes in a tree of exception 
+              'exceptionPaths' : list(str),  # exception names used to match leaves or nodes in a tree of exception
           }
       }
 

jupyter_client/connect.py

@@ -117,7 +117,7 @@ def write_connection_file(
         + int(hb_port <= 0)
     )
     if transport == "tcp":
-        for i in range(ports_needed):
+        for _ in range(ports_needed):
             sock = socket.socket()
             # struct.pack('ii', (0,0)) is 8 null bytes
             sock.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, b"\0" * 8)
@@ -129,7 +129,7 @@ def write_connection_file(
             ports.append(port)
     else:
         N = 1
-        for i in range(ports_needed):
+        for _ in range(ports_needed):
             while os.path.exists("%s-%s" % (ip, str(N))):
                 N += 1
             ports.append(N)
@@ -450,7 +450,7 @@ def cleanup_connection_file(self) -> None:
             self._connection_file_written = False
             try:
                 os.remove(self.connection_file)
-            except (IOError, OSError, AttributeError):
+            except (OSError, AttributeError):
                 pass
 
     def cleanup_ipc_files(self) -> None:
@@ -461,7 +461,7 @@ def cleanup_ipc_files(self) -> None:
             ipcfile = "%s-%i" % (self.ip, port)
             try:
                 os.remove(ipcfile)
-            except (IOError, OSError):
+            except OSError:
                 pass
 
     def _record_random_port_names(self) -> None:

jupyter_client/kernelspec.py

@@ -412,7 +412,7 @@ def install_kernel_spec(
     def install_native_kernel_spec(self, user=False):
         """DEPRECATED: Use ipykernel.kernelspec.install"""
         warnings.warn(
-            "install_native_kernel_spec is deprecated." " Use ipykernel.kernelspec import install.",
+            "install_native_kernel_spec is deprecated. Use ipykernel.kernelspec import install.",
             stacklevel=2,
         )
         from ipykernel.kernelspec import install

jupyter_client/launcher.py

@@ -157,7 +157,7 @@ def launch_kernel(
         proc = Popen(cmd, **kwargs)
     except Exception as ex:
         try:
-            msg = "Failed to run command:\n{}\n" "    PATH={!r}\n" "    with kwargs:\n{!r}\n"
+            msg = "Failed to run command:\n{}\n    PATH={!r}\n    with kwargs:\n{!r}\n"
             # exclude environment variables,
             # which may contain access tokens and the like.
             without_env = {key: value for key, value in kwargs.items() if key != "env"}

jupyter_client/localinterfaces.py

@@ -102,7 +102,7 @@ def _load_ips_ifconfig():
 
     try:
         out = _get_output("ifconfig")
-    except (IOError, OSError):
+    except OSError:
         # no ifconfig, it's usually in /sbin and /sbin is not on everyone's PATH
         out = _get_output("/sbin/ifconfig")
 
@@ -237,16 +237,16 @@ def _load_ips(suppress_exceptions=True):
         if os.name == "nt":
             try:
                 return _load_ips_ipconfig()
-            except (IOError, NoIPAddresses):
+            except NoIPAddresses:
                 pass
         else:
             try:
                 return _load_ips_ip()
-            except (IOError, OSError, NoIPAddresses):
+            except NoIPAddresses:
                 pass
             try:
                 return _load_ips_ifconfig()
-            except (IOError, OSError, NoIPAddresses):
+            except NoIPAddresses:
                 pass
 
         # lowest priority, use gethostbyname

jupyter_client/manager.py

@@ -519,7 +519,7 @@ async def _async_restart_kernel(self, now: bool = False, newports: bool = False,
             kernel.
         """
         if self._launch_args is None:
-            raise RuntimeError("Cannot restart the kernel. " "No previous call to 'start_kernel'.")
+            raise RuntimeError("Cannot restart the kernel. No previous call to 'start_kernel'.")
 
         # Stop currently running kernel.
         await ensure_async(self.shutdown_kernel(now=now, restart=True))

jupyter_client/provisioning/provisioner_base.py

@@ -185,7 +185,7 @@ async def get_provisioner_info(self) -> Dict[str, Any]:
 
         NOTE: The superclass method must always be called first to ensure proper serialization.
         """
-        provisioner_info: Dict[str, Any] = dict()
+        provisioner_info: Dict[str, Any] = {}
         provisioner_info['kernel_id'] = self.kernel_id
         provisioner_info['connection_info'] = self.connection_info
         return provisioner_info