Make line length 120 characters

Author: gmazoyer

docs/conf.py

@@ -98,9 +98,7 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 # html_static_path = ['_static']
 
-html_sidebars = {
-    "**": ["globaltoc.html", "relations.html", "sourcelink.html", "searchbox.html"]
-}
+html_sidebars = {"**": ["globaltoc.html", "relations.html", "sourcelink.html", "searchbox.html"]}
 
 # -- Options for HTMLHelp output ------------------------------------------
 

pyixapi/core/api.py

@@ -67,27 +67,17 @@ def __init__(
         self.facilities = Endpoint(self, "facilities", model=Facility)
         self.ips = Endpoint(self, "ips", model=IP)
         self.macs = Endpoint(self, "macs", model=MAC)
-        self.network_feature_configs = Endpoint(
-            self, "network-feature-configs", model=NetworkFeatureConfig
-        )
+        self.network_feature_configs = Endpoint(self, "network-feature-configs", model=NetworkFeatureConfig)
         self.network_features = Endpoint(self, "network-features", model=NetworkFeature)
-        self.network_service_configs = Endpoint(
-            self, "network-service-configs", model=NetworkServiceConfig
-        )
+        self.network_service_configs = Endpoint(self, "network-service-configs", model=NetworkServiceConfig)
         self.network_services = Endpoint(self, "network-services", model=NetworkService)
         self.pops = Endpoint(self, "pops", model=PoP)
         # Version 2+
-        self.member_joining_rules = Endpoint(
-            self, "member-joining-rules", model=MemberJoiningRule
-        )
+        self.member_joining_rules = Endpoint(self, "member-joining-rules", model=MemberJoiningRule)
         self.metro_areas = Endpoint(self, "metro-areas", model=MetroArea)
-        self.metro_area_networks = Endpoint(
-            self, "metro-area-networks", model=MetroAreaNetwork
-        )
+        self.metro_area_networks = Endpoint(self, "metro-area-networks", model=MetroAreaNetwork)
         self.ports = Endpoint(self, "ports", model=Port)
-        self.port_reservations = Endpoint(
-            self, "port-reservations", model=PortReservation
-        )
+        self.port_reservations = Endpoint(self, "port-reservations", model=PortReservation)
         self.roles = Endpoint(self, "roles", model=Role)
         self.role_assignments = Endpoint(self, "role-assignments", model=RoleAssignment)
 
@@ -96,15 +86,11 @@ def version(self) -> int:
         """
         Get the API version of IX-API.
         """
-        return Request(
-            base=self.url, token=self.access_token, http_session=self.http_session
-        ).get_version()
+        return Request(base=self.url, token=self.access_token, http_session=self.http_session).get_version()
 
     @property
     def accounts(self) -> Endpoint:
-        return Endpoint(
-            self, "customers" if self.version == 1 else "accounts", model=Account
-        )
+        return Endpoint(self, "customers" if self.version == 1 else "accounts", model=Account)
 
     @property
     def product_offerings(self) -> Endpoint:
@@ -132,9 +118,9 @@ def authenticate(self) -> Record:
         if self.refresh_token and not self.refresh_token.is_expired:
             return self.refresh_authentication()
 
-        r = Request(
-            cat(self.url, "auth", "token"), http_session=self.http_session
-        ).post(data={"api_key": self.key, "api_secret": self.secret})
+        r = Request(cat(self.url, "auth", "token"), http_session=self.http_session).post(
+            data={"api_key": self.key, "api_secret": self.secret}
+        )
 
         self.access_token = Token.from_jwt(r["access_token"])
         self.refresh_token = Token.from_jwt(r["refresh_token"])
@@ -165,6 +151,4 @@ def health(self) -> dict[str, Any]:
         if self.version == 1:
             return {}
 
-        return Request(
-            base=self.url, token=self.access_token, http_session=self.http_session
-        ).get_health()
+        return Request(base=self.url, token=self.access_token, http_session=self.http_session).get_health()

pyixapi/core/query.py

@@ -16,19 +16,13 @@ def __init__(self, r) -> None:
         if r.status_code == HTTPStatus.NOT_FOUND:
             self.message = f"The requested url: {r.url} could not be found."
         elif r.status_code == HTTPStatus.UNAUTHORIZED:
-            self.message = (
-                "Authentication credentials are invalid, tokens renewal required."
-            )
+            self.message = "Authentication credentials are invalid, tokens renewal required."
         else:
             try:
-                self.message = (
-                    f"The request failed with code {r.status_code} "
-                    f"{r.reason}: {r.json()}"
-                )
+                self.message = f"The request failed with code {r.status_code} " f"{r.reason}: {r.json()}"
             except ValueError:
                 self.message = (
-                    f"The request failed with code {r.status_code} "
-                    f"{r.reason} but details were not found as JSON."
+                    f"The request failed with code {r.status_code} " f"{r.reason} but details were not found as JSON."
                 )
 
         super().__init__(r)
@@ -50,9 +44,7 @@ def __init__(self, req) -> None:
         super().__init__(req)
 
         self.req = req
-        self.error = (
-            "The server returned invalid (non-JSON) data. Maybe not an IX-API server?"
-        )
+        self.error = "The server returned invalid (non-JSON) data. Maybe not an IX-API server?"
 
     def __str__(self) -> str:
         return self.error
@@ -71,9 +63,7 @@ class Request:
         dict.
     """
 
-    def __init__(
-        self, base, http_session, filters=None, key=None, token=None, user_agent=None
-    ) -> None:
+    def __init__(self, base, http_session, filters=None, key=None, token=None, user_agent=None) -> None:
         self.base = base
         self.filters = filters or None
         self.key = key
@@ -87,9 +77,7 @@ def get_openapi(self) -> Any:
         Get the OpenAPI Spec.
         """
         headers = {"Content-Type": "application/json;"}
-        req = self.http_session.get(
-            cat(self.base, "docs/?format=openapi"), headers=headers
-        )
+        req = self.http_session.get(cat(self.base, "docs/?format=openapi"), headers=headers)
         if req.ok:
             return req.json()
 
@@ -144,9 +132,7 @@ def _make_call(
             if add_params:
                 params.update(add_params)
 
-        r = getattr(self.http_session, verb)(
-            url_override or self.url, headers=headers, params=params, json=data
-        )
+        r = getattr(self.http_session, verb)(url_override or self.url, headers=headers, params=params, json=data)
 
         if verb == "delete":
             if r.ok:

pyixapi/core/response.py

@@ -68,12 +68,8 @@ def __iter__(self) -> "RecordSet":
 
     def __next__(self) -> "Record":
         if self._response_cache:
-            return self.endpoint.return_obj(
-                self._response_cache.pop(), self.endpoint.api, self.endpoint
-            )
-        return self.endpoint.return_obj(
-            next(self.response), self.endpoint.api, self.endpoint
-        )
+            return self.endpoint.return_obj(self._response_cache.pop(), self.endpoint.api, self.endpoint)
+        return self.endpoint.return_obj(next(self.response), self.endpoint.api, self.endpoint)
 
     def __len__(self) -> int:
         try:
@@ -149,9 +145,7 @@ class Record:
 
     url = None
 
-    def __init__(
-        self, values: dict[str, Any], api: "API", endpoint: "Endpoint"
-    ) -> None:
+    def __init__(self, values: dict[str, Any], api: "API", endpoint: "Endpoint") -> None:
         self._full_cache = []
         self._init_cache = []
         self.api = api
@@ -255,9 +249,7 @@ def serialize(self, nested=False, init=False):
             if isinstance(current_val, Record):
                 current_val = current_val.serialize(nested=True)
             if isinstance(current_val, list):
-                current_val = [
-                    v.id if isinstance(v, Record) else v for v in current_val
-                ]
+                current_val = [v.id if isinstance(v, Record) else v for v in current_val]
             r[i] = current_val
         return r
 
@@ -270,9 +262,7 @@ def fmt_dict(k, v):
             return k, v
 
         current = Hashabledict({fmt_dict(k, v) for k, v in self.serialize().items()})
-        init = Hashabledict(
-            {fmt_dict(k, v) for k, v in self.serialize(init=True).items()}
-        )
+        init = Hashabledict({fmt_dict(k, v) for k, v in self.serialize(init=True).items()})
         return {i[0] for i in set(current.items()) ^ set(init.items())}
 
     def updates(self):

pyproject.toml

@@ -25,23 +25,11 @@ pytest = "*"
 ruff = ">=0.5,<0.7"
 
 [tool.ruff]
-line-length = 88
+line-length = 120
 
-exclude = [
-    ".git",
-    ".tox",
-    ".venv",
-    "env",
-    "_build",
-    "build",
-    "dist",
-    "examples",
-    "__main__.py",
-]
+exclude = [".git", ".tox", ".venv", "env", "_build", "build", "dist", "examples", "__main__.py"]
 
 [tool.ruff.lint]
-preview = true
-
 select = [
     "ASYNC", # flake8-async
     "B",     # flake8-bugbear
@@ -78,9 +66,6 @@ indent-style = "space"
 skip-magic-trailing-comma = false
 line-ending = "auto"
 
-[tool.ruff.lint.pycodestyle]
-max-line-length = 88
-
 [tool.ruff.lint.mccabe]
 max-complexity = 31