fix: remove kw_only argument introduced in 3.10

Snowflake-Labs · Oct 18, 2024 · fc0d0f1 · fc0d0f1
1 parent 9be9e01
commit fc0d0f1
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 28 deletions.
diff --git a/schemachange/config/BaseConfig.py b/schemachange/config/BaseConfig.py
@@ -18,7 +18,7 @@
 T = TypeVar("T", bound="BaseConfig")
 
 
-@dataclasses.dataclass(frozen=True, kw_only=True)
+@dataclasses.dataclass(frozen=True)
 class BaseConfig(ABC):
     default_config_file_name: ClassVar[str] = "schemachange-config.yml"
 

diff --git a/schemachange/config/DeployConfig.py b/schemachange/config/DeployConfig.py
@@ -9,7 +9,7 @@
 from schemachange.config.utils import get_snowflake_identifier_string
 
 
-@dataclasses.dataclass(frozen=True, kw_only=True)
+@dataclasses.dataclass(frozen=True)
 class DeployConfig(BaseConfig):
     subcommand: Literal["deploy"] = "deploy"
     snowflake_account: str | None = None

diff --git a/schemachange/config/RenderConfig.py b/schemachange/config/RenderConfig.py
@@ -8,10 +8,10 @@
 from schemachange.config.utils import validate_file_path
 
 
-@dataclasses.dataclass(frozen=True, kw_only=True)
+@dataclasses.dataclass(frozen=True)
 class RenderConfig(BaseConfig):
+    script_path: Path | None = None
     subcommand: Literal["render"] = "render"
-    script_path: Path
 
     @classmethod
     def factory(
@@ -31,3 +31,9 @@ def factory(
             script_path=validate_file_path(file_path=script_path),
             **kwargs,
         )
+
+    def __post_init__(self):
+        if self.script_path is None:
+            raise TypeError(
+                "RenderConfig is missing 1 required argument: 'script_path'"
+            )
diff --git a/schemachange/session/Credential.py b/schemachange/session/Credential.py
@@ -2,7 +2,6 @@
 
 import dataclasses
 import os
-from abc import ABC
 from typing import Literal, Union
 
 import structlog
@@ -14,37 +13,32 @@
 )
 
 
-@dataclasses.dataclass(kw_only=True, frozen=True)
-class Credential(ABC):
-    authenticator: str
-
-
-@dataclasses.dataclass(kw_only=True, frozen=True)
-class OauthCredential(Credential):
-    authenticator: Literal["oauth"] = "oauth"
+@dataclasses.dataclass(frozen=True)
+class OauthCredential:
     token: str
+    authenticator: Literal["oauth"] = "oauth"
 
 
-@dataclasses.dataclass(kw_only=True, frozen=True)
-class PasswordCredential(Credential):
-    authenticator: Literal["snowflake"] = "snowflake"
+@dataclasses.dataclass(frozen=True)
+class PasswordCredential:
     password: str
+    authenticator: Literal["snowflake"] = "snowflake"
 
 
-@dataclasses.dataclass(kw_only=True, frozen=True)
-class PrivateKeyCredential(Credential):
-    authenticator: Literal["snowflake"] = "snowflake"
+@dataclasses.dataclass(frozen=True)
+class PrivateKeyCredential:
     private_key: bytes
+    authenticator: Literal["snowflake"] = "snowflake"
 
 
-@dataclasses.dataclass(kw_only=True, frozen=True)
-class ExternalBrowserCredential(Credential):
-    authenticator: Literal["externalbrowser"] = "externalbrowser"
+@dataclasses.dataclass(frozen=True)
+class ExternalBrowserCredential:
     password: str | None = None
+    authenticator: Literal["externalbrowser"] = "externalbrowser"
 
 
-@dataclasses.dataclass(kw_only=True, frozen=True)
-class OktaCredential(Credential):
+@dataclasses.dataclass(frozen=True)
+class OktaCredential:
     authenticator: str
     password: str
 

diff --git a/schemachange/session/Script.py b/schemachange/session/Script.py
@@ -18,7 +18,7 @@
 T = TypeVar("T", bound="Script")
 
 
-@dataclasses.dataclass(kw_only=True, frozen=True)
+@dataclasses.dataclass(frozen=True)
 class Script(ABC):
     pattern: ClassVar[Pattern[str]]
     type: ClassVar[Literal["V", "R", "A"]]
@@ -47,7 +47,7 @@ def from_path(cls, file_path: Path, **kwargs) -> T:
         )
 
 
-@dataclasses.dataclass(kw_only=True, frozen=True)
+@dataclasses.dataclass(frozen=True)
 class VersionedScript(Script):
     pattern: ClassVar[re.Pattern[str]] = re.compile(
         r"^(V)(?P<version>.+?)?__(?P<description>.+?)\.", re.IGNORECASE
@@ -64,15 +64,15 @@ def from_path(cls: T, file_path: Path, **kwargs) -> T:
         )
 
 
-@dataclasses.dataclass(kw_only=True, frozen=True)
+@dataclasses.dataclass(frozen=True)
 class RepeatableScript(Script):
     pattern: ClassVar[re.Pattern[str]] = re.compile(
         r"^(R)__(?P<description>.+?)\.", re.IGNORECASE
     )
     type: ClassVar[Literal["R"]] = "R"
 
 
-@dataclasses.dataclass(kw_only=True, frozen=True)
+@dataclasses.dataclass(frozen=True)
 class AlwaysScript(Script):
     pattern: ClassVar[re.Pattern[str]] = re.compile(
         r"^(A)__(?P<description>.+?)\.", re.IGNORECASE