Merge pull request #3701 from 2i2c-org/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

.github/actions/setup-deploy/action.yaml

@@ -57,7 +57,7 @@ runs:
       uses: actions/cache@v4
       with:
         path: ~/.cache/pip
-        # key determines if we define or re-use an existing cache or not. Our
+        # key determines if we define or reuse an existing cache or not. Our
         # key ensure we cache within a workflow run and its attempts, but not
         # between workflow runs.
         key: "${{ github.run_id }}"

.pre-commit-config.yaml

@@ -31,15 +31,15 @@ repos:
 
   # Autoformat: Python code
   - repo: https://github.com/psf/black
-    rev: "23.12.1"
+    rev: "24.1.1"
     hooks:
       - id: black
         # This is a `.py` file but is encrypted with sops
         exclude: deployer/commands/generate/cryptnono_config/enc-blocklist-generator.secret.py
 
   # Lint: Python code
   - repo: https://github.com/pycqa/flake8
-    rev: "6.1.0"
+    rev: "7.0.0"
     hooks:
       - id: flake8
         # This is a `.py` file but is encrypted with sops
@@ -61,7 +61,7 @@ repos:
 
   # Prevent known typos from being committed
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.5
+    rev: v2.2.6
     hooks:
       - id: codespell
         args:

deployer/cli_app.py

@@ -5,6 +5,7 @@
 for the same CLI application. So we can put deployment related stuff under
 deployer.py, debug related stuff under debug.py, etc
 """
+
 import typer
 
 # The typer app to which all subcommands are attached

deployer/commands/debug.py

@@ -1,6 +1,7 @@
 """
 Helper commands for debugging active issues in a hub
 """
+
 import string
 import subprocess
 from enum import Enum

deployer/commands/deployer.py

@@ -1,6 +1,7 @@
 """
 Actions available when deploying many JupyterHubs to many Kubernetes clusters
 """
+
 import base64
 import os
 import subprocess

deployer/commands/exec/cloud.py

@@ -4,6 +4,7 @@
 Google Cloud's `gcloud` is more user friendly than AWS's `aws`,
 so we have some augmented methods here primarily for AWS use.
 """
+
 import json
 import os
 import subprocess

deployer/commands/generate/dedicated_cluster/aws.py

@@ -6,6 +6,7 @@
 - a .tfvars file
 - An ssh-key (the private part is encrypted)
 """
+
 import os
 import subprocess
 

deployer/commands/generate/dedicated_cluster/dedicated_cluster_app.py

@@ -3,6 +3,7 @@
 nested as a sub-command named "dedicated-cluster"
 under the `generate` sub-command of the deployer.
 """
+
 import typer
 
 from deployer.cli_app import generate_app

deployer/commands/generate/dedicated_cluster/gcp.py

@@ -9,6 +9,7 @@
 - `config/<cluster_name>/enc-support.secret.values.yaml`
 
 """
+
 import jinja2
 import typer
 from typing_extensions import Annotated

deployer/commands/generate/helm_upgrade/decision.py

@@ -3,6 +3,7 @@
 support helm chart upgrading depending on an input list of filenames that have been
 added or modified in a GitHub Pull Request.
 """
+
 import fnmatch
 
 from rich.console import Console
@@ -111,9 +112,9 @@ def generate_hub_matrix_jobs(
             matrix_job["hub_name"] = hub["name"]
 
             if upgrade_all_hubs_on_all_clusters:
-                matrix_job[
-                    "reason_for_redeploy"
-                ] = "Core infrastructure has been modified"
+                matrix_job["reason_for_redeploy"] = (
+                    "Core infrastructure has been modified"
+                )
 
             matrix_jobs.append(matrix_job)
 
@@ -133,10 +134,9 @@ def generate_hub_matrix_jobs(
                 # upgraded
                 matrix_job = cluster_info.copy()
                 matrix_job["hub_name"] = hub["name"]
-                matrix_job[
-                    "reason_for_redeploy"
-                ] = "Following helm chart values files were modified: " + ", ".join(
-                    [path.name for path in intersection]
+                matrix_job["reason_for_redeploy"] = (
+                    "Following helm chart values files were modified: "
+                    + ", ".join([path.name for path in intersection])
                 )
                 matrix_jobs.append(matrix_job)
 
@@ -210,9 +210,9 @@ def generate_support_matrix_jobs(
             matrix_job["upgrade_support"] = True
 
             if upgrade_support_on_all_clusters:
-                matrix_job[
-                    "reason_for_support_redeploy"
-                ] = "Support helm chart has been modified"
+                matrix_job["reason_for_support_redeploy"] = (
+                    "Support helm chart has been modified"
+                )
 
             matrix_jobs.append(matrix_job)
 
@@ -227,10 +227,9 @@ def generate_support_matrix_jobs(
             if intersection:
                 matrix_job = cluster_info.copy()
                 matrix_job["upgrade_support"] = True
-                matrix_job[
-                    "reason_for_support_redeploy"
-                ] = "Following helm chart values files were modified: " + ", ".join(
-                    [path.name for path in intersection]
+                matrix_job["reason_for_support_redeploy"] = (
+                    "Following helm chart values files were modified: "
+                    + ", ".join([path.name for path in intersection])
                 )
                 matrix_jobs.append(matrix_job)
 
@@ -310,9 +309,9 @@ def move_staging_hubs_to_staging_matrix(
             # Update the matching job in support_and_staging_matrix_jobs to hold
             # information related to upgrading the staging hub
             support_and_staging_matrix_jobs[job_idx]["upgrade_staging"] = True
-            support_and_staging_matrix_jobs[job_idx][
-                "reason_for_staging_redeploy"
-            ] = staging_job["reason_for_redeploy"]
+            support_and_staging_matrix_jobs[job_idx]["reason_for_staging_redeploy"] = (
+                staging_job["reason_for_redeploy"]
+            )
         else:
             # A job with a matching cluster name doesn't exist, this is because its
             # support chart doesn't need upgrading. We create a new job in that will
@@ -365,10 +364,9 @@ def ensure_support_staging_jobs_have_correct_keys(
                 # There are prod hubs on this cluster that require an upgrade, and so we
                 # also upgrade staging
                 job["upgrade_staging"] = True
-                job[
-                    "reason_for_staging_redeploy"
-                ] = "Following prod hubs require redeploy: " + ", ".join(
-                    hubs_on_this_cluster
+                job["reason_for_staging_redeploy"] = (
+                    "Following prod hubs require redeploy: "
+                    + ", ".join(hubs_on_this_cluster)
                 )
             else:
                 # There are no prod hubs on this cluster that require an upgrade, so we

deployer/commands/generate/resource_allocation/daemonset_requests.py

@@ -76,12 +76,12 @@ def get_daemon_sets_requests():
         # So we have to calculate the requests of the init containers and containers separately,
         # and take the max as the effective request / limit
 
-        container_req_mem = (
-            container_req_cpu
-        ) = container_lim_mem = container_lim_cpu = 0
-        init_container_req_mem = (
-            init_container_req_cpu
-        ) = init_container_lim_mem = init_container_lim_cpu = 0
+        container_req_mem = container_req_cpu = container_lim_mem = (
+            container_lim_cpu
+        ) = 0
+        init_container_req_mem = init_container_req_cpu = init_container_lim_mem = (
+            init_container_lim_cpu
+        ) = 0
 
         for c in ds["spec"]["template"]["spec"]["containers"]:
             resources = c.get("resources", {})

deployer/commands/generate/resource_allocation/resource_allocation_app.py

@@ -3,6 +3,7 @@
 nested as a sub-command named "resource-allocation"
 under the `generate` sub-command of the deployer.
 """
+
 import typer
 
 from deployer.cli_app import generate_app

deployer/commands/validate/config.py

@@ -2,6 +2,7 @@
 Functions related to validating configuration files such as helm chart values and our
 cluster.yaml files
 """
+
 import functools
 import json
 import os

deployer/keys/decrypt_age.py

@@ -1,6 +1,7 @@
 """
 Simple utility to decrypt secrets sent to `[email protected]` via `age`
 """
+
 import pathlib
 import subprocess
 import sys

deployer/utils/file_acquisition.py

@@ -2,6 +2,7 @@
 Functions related to finding and reading files. Checking files exist, finding their
 absolute paths, decrypting and reading encrypted files when needed.
 """
+
 import json
 import os
 import subprocess

docs/helper-programs/generate-general-info-table-about-hubs.py

@@ -5,6 +5,7 @@
 - docs/_static/hub-table.json is published with the docs and meant for reuse in other parts of 2i2c
 - docs/tmp/hub-table.csv is read by reference/hubs.md to create a list of hubs
 """
+
 import pandas as pd
 from utils import get_cluster_provider, get_clusters_list, write_to_json_and_csv_files
 from yaml import safe_load
@@ -71,9 +72,11 @@ def build_hub_list_entry(
         "cluster": cluster["name"],
         "provider": provider,
         "data center location": datacentre_loc,  # Americanising for you ;)
-        "UI console link": f"[Use with **{account}** account]({cluster_console_url})"
-        if cluster_console_url
-        else None,
+        "UI console link": (
+            f"[Use with **{account}** account]({cluster_console_url})"
+            if cluster_console_url
+            else None
+        ),
         "admin_url": f"[admin](https://{hub['domain']}/hub/admin)",
     }
 

docs/helper-programs/generate-hub-features-table.py

@@ -5,6 +5,7 @@
 - docs/_static/hub-options-table.json is published with the docs and meant for reuse in other parts of 2i2c
 - docs/tmp/hub-options-table.csv is read by reference/options.md to create a list of hubs
 """
+
 import hcl2
 import pandas as pd
 from utils import (

extra-scripts/comment-deployment-plan-pr.py

@@ -4,6 +4,7 @@
 to download the markdown content of the deployment plan from a GitHub Actions
 workflow artifact and then post it as a comment on the PR that generated the plan.
 """
+
 import io
 import os
 import re

extra-scripts/comment-test-link-merged-pr.py

@@ -17,6 +17,7 @@
 Pull Request number, and the name of the *other* workflow that we want to provide
 a link to.
 """
+
 import os
 import re
 import sys

extra-scripts/rsync-active-users.py

@@ -9,6 +9,7 @@
 An environment variable 'JUPYTERHUB_ADMIN' must be set with an admin token,
 obtainable from {hub_url}/hub/token by an admin user.
 """
+
 import argparse
 import os
 import string

noxfile.py

@@ -9,6 +9,7 @@
 - Install nox:                        pip install nox
 - Start a live reloading docs server: nox -- live
 """
+
 import nox
 
 nox.options.reuse_existing_virtualenvs = True