To pyproject (#4)

* build: Switch to pyproject.toml

* build: Better pre-commit

* fix: Remove Optional & new lock

---------

Co-authored-by: a.b.christie <alan.christie@matildapeak.com>

Author: alanbchristie

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 ---
-minimum_pre_commit_version: 3.8.0
+minimum_pre_commit_version: 4.5.0
 exclude: ^src/squeck/VERSION
 
 repos:
@@ -64,3 +64,5 @@ repos:
     args:
     - --install-types
     - --non-interactive
+    additional_dependencies:
+    - textual

src/squeck/access_token.py

@@ -1,6 +1,5 @@
 """Gets AS and DM access tokens."""
 
-from typing import Optional
 from squonk2.auth import Auth
 from squonk2.environment import Environment
 
@@ -10,15 +9,15 @@ class AccessToken:
 
     @classmethod
     def get_as_access_token(
-        cls, env: Environment, *, prior_token: Optional[str] = None
-    ) -> Optional[str]:
+        cls, env: Environment, *, prior_token: str | None = None
+    ) -> str | None:
         """Returns a token for the AS API.
         This returns None on error or if the client ID is not defined.
         """
         assert env
         if not env.keycloak_as_client_id:
             return None
-        access_token: Optional[str] = Auth.get_access_token(
+        access_token: str | None = Auth.get_access_token(
             keycloak_url=env.keycloak_url,
             keycloak_realm=env.keycloak_realm,
             keycloak_client_id=env.keycloak_as_client_id,
@@ -31,14 +30,14 @@ def get_as_access_token(
 
     @classmethod
     def get_dm_access_token(
-        cls, env: Environment, *, prior_token: Optional[str] = None
-    ) -> Optional[str]:
+        cls, env: Environment, *, prior_token: str | None = None
+    ) -> str | None:
         """Returns a token for the DM API
         or None if a token could not be obtained."""
         assert env
         if not env.keycloak_dm_client_id:
             return None
-        access_token: Optional[str] = Auth.get_access_token(
+        access_token: str | None = Auth.get_access_token(
             keycloak_url=env.keycloak_url,
             keycloak_realm=env.keycloak_realm,
             keycloak_client_id=env.keycloak_dm_client_id,

src/squeck/squeck.py

@@ -4,7 +4,7 @@
 import argparse
 import os
 import sys
-from typing import Optional
+from typing import Any
 
 from squonk2.environment import Environment
 from textual.app import App, ComposeResult
@@ -15,7 +15,7 @@
 
 # Users set SQUONK2_LOGFILE to enable logging
 # e.g. "export SQUONK2_LOGFILE=./squad.log"
-_LOG: Optional[str] = os.environ.get("SQUONK2_LOGFILE")
+_LOG: str | None = os.environ.get("SQUONK2_LOGFILE")
 
 # Read the version file
 with open(
@@ -24,7 +24,7 @@
     __version__ = f.read().strip()
 
 
-class Squeck(App):  # type: ignore
+class Squeck(App[Any]):
     """An example of a very simple Textual App"""
 
     def compose(self) -> ComposeResult:
@@ -38,7 +38,7 @@ def compose(self) -> ComposeResult:
 
     def on_mount(self) -> None:
         """App specialisation."""
-        self.sub_title = f"v{__version__}"  # pylint: attribute-defined-outside-init
+        self.sub_title = f"v{__version__}"
 
 
 def main() -> int:

src/squeck/widgets/env.py

@@ -1,7 +1,6 @@
 """A textual widget used to display environment information."""
 
 import random
-from typing import Optional
 
 from rich.panel import Panel
 from rich.style import Style
@@ -28,26 +27,26 @@
 _UI_HOSTNAME_POSTFIX: str = "/data-manager-ui"
 
 
-class EnvWidget(Static):  # type: ignore
+class EnvWidget(Static):
     """Displays the environment."""
 
-    as_access_token: Optional[str] = None
-    dm_access_token: Optional[str] = None
+    as_access_token: str | None = None
+    dm_access_token: str | None = None
 
     def __init__(self, environment_name: str) -> None:
         super().__init__()
         self.environment_name = environment_name
         self.environment = Environment(environment_name)
 
-        self.as_api: Optional[AsApi] = None
+        self.as_api: AsApi | None = None
         if self.environment.as_api:
             self.as_api = AsApi()
             self.as_api.set_api_url(self.environment.as_api, verify_ssl_cert=False)
-        self.dm_api: Optional[DmApi] = None
+        self.dm_api: DmApi | None = None
         if self.environment.dm_api:
             self.dm_api = DmApi()
             self.dm_api.set_api_url(self.environment.dm_api, verify_ssl_cert=False)
-        self.ui_api: Optional[UiApi] = None
+        self.ui_api: UiApi | None = None
         if self.environment.ui_api:
             self.ui_api = UiApi()
             self.ui_api.set_api_url(self.environment.ui_api, verify_ssl_cert=False)
@@ -127,7 +126,7 @@ def render(self) -> RenderResult:
         kc_host = Text(f"{self.environment.keycloak_hostname}", style=_KEY_VALUE_STYLE)
 
         # The API lines are also dynamically styled.
-        as_hostname: Optional[str] = self.environment.as_hostname
+        as_hostname: str | None = self.environment.as_hostname
         if as_hostname:
             as_hostname_text: Text = Text(f"{as_hostname} ", style=_KEY_VALUE_STYLE)
             if self.as_access_token:
@@ -137,7 +136,7 @@ def render(self) -> RenderResult:
         else:
             as_hostname_text = Text("Undefined", style=_VALUE_ERROR_STYLE)
 
-        dm_hostname: Optional[str] = self.environment.dm_hostname
+        dm_hostname: str | None = self.environment.dm_hostname
         if dm_hostname:
             dm_hostname_text: Text = Text(f"{dm_hostname} ", style=_KEY_VALUE_STYLE)
             if self.dm_access_token:
@@ -147,7 +146,7 @@ def render(self) -> RenderResult:
         else:
             dm_hostname_text = Text("Undefined", style=_VALUE_ERROR_STYLE)
 
-        ui_hostname: Optional[str] = self.environment.ui_hostname
+        ui_hostname: str | None = self.environment.ui_hostname
         if ui_hostname:
             ui_hostname_text: Text = Text(
                 ui_hostname + _UI_HOSTNAME_POSTFIX + " ", style=_KEY_VALUE_STYLE