Make tox consistent (#141)

* update tox config

* Make linting consistent

* remove black

* fix F401 and re-add

Author: bertiethorpe

Dockerfile

@@ -26,7 +26,7 @@ RUN apt-get update && \
     apt-get install --no-install-recommends python3 tini ca-certificates -y && \
     rm -rf /var/lib/apt/lists/*
 
-# Copy accross the venv
+# Copy across the venv
 COPY --from=build-image /opt/venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 

azimuth_schedule_operator/__main__.py

@@ -10,7 +10,7 @@ async def main():
     Run the operator and the metrics server together.
     """
     # This import is required to pick up the operator handlers
-    from . import operator  # noqa
+    from . import operator  # noqa: F401
 
     kopf.configure(log_prefix=True)
     tasks = await kopf.spawn_tasks(

azimuth_schedule_operator/metrics.py

@@ -1,12 +1,10 @@
 import asyncio
 import functools
 
+import easykube
 from aiohttp import web
-
 from dateutil.parser import isoparse
 
-import easykube
-
 from .models import registry
 
 
@@ -15,7 +13,7 @@ class Metric:
     prefix = None
     # The suffix for the metric
     suffix = None
-    # The type of the metric - info or guage
+    # The type of the metric - info or gauge
     type = "info"
     # The description of the metric
     description = None
@@ -129,7 +127,7 @@ def format_value(value):
     formatted = repr(value)
     dot = formatted.find(".")
     if value > 0 and dot > 6:
-        mantissa = f"{formatted[0]}.{formatted[1:dot]}{formatted[dot + 1:]}".rstrip(
+        mantissa = f"{formatted[0]}.{formatted[1:dot]}{formatted[dot + 1 :]}".rstrip(
             "0."
         )
         return f"{mantissa}e+0{dot - 1}"
@@ -147,7 +145,7 @@ def render_openmetrics(*metrics):
 
         for labels, value in metric.records():
             if labels:
-                labelstr = "{{{0}}}".format(
+                labelstr = "{{{}}}".format(
                     ",".join([f'{k}="{escape(v)}"' for k, v in sorted(labels.items())])
                 )
             else:

azimuth_schedule_operator/models/v1alpha1/lease.py

@@ -1,9 +1,7 @@
 import datetime as dt
-import typing as t
-
-from pydantic import Field
 
 from kube_custom_resource import CustomResource, schema
+from pydantic import Field
 
 
 class Machine(schema.BaseModel):
@@ -20,7 +18,7 @@ class Machine(schema.BaseModel):
 class ResourcesSpec(schema.BaseModel):
     """The resources that a lease is reserving."""
 
-    machines: t.List[Machine] = Field(
+    machines: list[Machine] = Field(
         default_factory=list,
         description="Machines that should be reserved by the lease.",
     )
@@ -92,7 +90,7 @@ class LeaseStatus(schema.BaseModel, extra="allow"):
         description="Mapping of original size name to reserved size name.",
     )
 
-    def set_phase(self, phase: LeasePhase, error_message: t.Optional[str] = None):
+    def set_phase(self, phase: LeasePhase, error_message: str | None = None):
         """Set the phase of the lease, along with an optional error message."""
         self.phase = phase
         self.error_message = error_message if phase == LeasePhase.ERROR else ""

azimuth_schedule_operator/models/v1alpha1/schedule.py

@@ -1,8 +1,8 @@
 import datetime
 
 import kube_custom_resource as crd
-from kube_custom_resource import schema
 import pydantic
+from kube_custom_resource import schema
 
 
 class ScheduleStatus(schema.BaseModel):

azimuth_schedule_operator/openstack.py

@@ -4,9 +4,7 @@
 import urllib.parse
 
 import httpx
-
 import yaml
-
 from easykube import rest
 
 
@@ -172,7 +170,7 @@ async def __aenter__(self):
         client = Client(
             base_url=self._auth.url, auth=self._auth, transport=self._transport
         )
-        # We have to slightly artifically create the catalog URL as we don't
+        # We have to slightly artificially create the catalog URL as we don't
         # benefit from the prefix handling that the resources use
         catalog_url = self._auth.url.rstrip("/") + "/v3/auth/catalog"
         try:

azimuth_schedule_operator/operator.py

@@ -6,17 +6,18 @@
 import os
 import sys
 
+import easykube
 import httpx
 import kopf
 
-import easykube
-
+from azimuth_schedule_operator import openstack
 from azimuth_schedule_operator.models import registry
 from azimuth_schedule_operator.models.v1alpha1 import (
     lease as lease_crd,
+)
+from azimuth_schedule_operator.models.v1alpha1 import (
     schedule as schedule_crd,
 )
-from azimuth_schedule_operator import openstack
 from azimuth_schedule_operator.utils import k8s
 
 LOG = logging.getLogger(__name__)
@@ -163,8 +164,8 @@ async def check_for_delete(namespace: str, schedule: schedule_crd.Schedule):
 async def update_schedule(
     namespace: str,
     name: str,
-    ref_exists: bool = None,
-    ref_delete_triggered: bool = None,
+    ref_exists: bool | None = None,
+    ref_delete_triggered: bool | None = None,
 ):
     now = datetime.datetime.now(datetime.timezone.utc)
     now_string = now.strftime("%Y-%m-%dT%H:%M:%SZ")
@@ -375,7 +376,7 @@ async def reconcile_lease(body, logger, **_):
                     lease.status.size_name_map = await get_size_name_map(
                         cloud, lease.status.size_map
                     )
-                # Save the currrent status of the lease
+                # Save the current status of the lease
                 await save_instance_status(lease)
         else:
             # We are not using Blazar

azimuth_schedule_operator/tests/models/test_crds.py

@@ -1,3 +1,5 @@
+# ruff: noqa: E501
+
 import json
 
 from azimuth_schedule_operator.models import registry
@@ -293,5 +295,5 @@ def test_lease_crd_json(self):
       }
     ]
   }
-}"""  # noqa
+}"""
         self.assertEqual(expected, actual)

azimuth_schedule_operator/tests/test_lease.py

@@ -2,18 +2,15 @@
 import unittest
 from unittest import mock
 
-from easykube.rest.util import PropertyDict
-
 import freezegun
-
 import kopf
+from easykube.rest.util import PropertyDict
 
-from ..models.v1alpha1 import lease as lease_crd
-from .. import openstack, operator
+from azimuth_schedule_operator import openstack, operator
+from azimuth_schedule_operator.models.v1alpha1 import lease as lease_crd
 
 from . import util
 
-
 API_VERSION = "scheduling.azimuth.stackhpc.com/v1alpha1"
 
 
@@ -185,9 +182,9 @@ async def test_save_instance_status(self, k8s_client):
     async def test_save_instance_status_conflict(self, k8s_client):
         lease_data = fake_lease(phase=lease_crd.LeasePhase.PENDING)
 
-        k8s_client.apis[API_VERSION].resources["leases/status"].replace.side_effect = (
-            util.k8s_api_error(409)
-        )
+        k8s_client.apis[API_VERSION].resources[
+            "leases/status"
+        ].replace.side_effect = util.k8s_api_error(409)
 
         lease = lease_crd.Lease.model_validate(lease_data)
         with self.assertRaises(kopf.TemporaryError):
@@ -351,15 +348,15 @@ def test_get_size_map(self):
 
     async def test_get_size_name_map(self):
         cloud = util.mock_openstack_cloud()
-        cloud.clients["compute"].resources["flavors"].list.return_value = (
-            util.as_async_iterable(
-                [
-                    PropertyDict({"id": "id1", "name": "flavor1"}),
-                    PropertyDict({"id": "id2", "name": "flavor2"}),
-                    PropertyDict({"id": "newid1", "name": "newflavor1"}),
-                    PropertyDict({"id": "newid2", "name": "newflavor2"}),
-                ]
-            )
+        cloud.clients["compute"].resources[
+            "flavors"
+        ].list.return_value = util.as_async_iterable(
+            [
+                PropertyDict({"id": "id1", "name": "flavor1"}),
+                PropertyDict({"id": "id2", "name": "flavor2"}),
+                PropertyDict({"id": "newid1", "name": "newflavor1"}),
+                PropertyDict({"id": "newid2", "name": "newflavor2"}),
+            ]
         )
 
         size_map = {"id1": "newid1", "id2": "newid2", "id3": "newid3"}
@@ -1290,9 +1287,9 @@ async def test_delete_lease_finalizer_present(self, k8s_client):
     async def test_delete_lease_secret_already_deleted(self, k8s_client):
         # Configure the Kubernetes client
         self.k8s_client_config_common(k8s_client)
-        k8s_client.apis["v1"].resources["secrets"].fetch.side_effect = (
-            util.k8s_api_error(404)
-        )
+        k8s_client.apis["v1"].resources[
+            "secrets"
+        ].fetch.side_effect = util.k8s_api_error(404)
 
         lease = fake_lease()
         await operator.delete_lease(lease, mock.Mock())

azimuth_schedule_operator/tests/test_schedule.py

@@ -2,8 +2,8 @@
 import unittest
 from unittest import mock
 
-from azimuth_schedule_operator.models.v1alpha1 import schedule as schedule_crd
 from azimuth_schedule_operator import operator
+from azimuth_schedule_operator.models.v1alpha1 import schedule as schedule_crd
 
 
 class TestSchedule(unittest.IsolatedAsyncioTestCase):