relocate v2

Author: fregataa

src/etcetra/types.py

@@ -189,10 +189,3 @@ class EtcdLockOption:
     lock_name: str
     timeout: Optional[float]
     ttl: Optional[int]
-
-
-@dataclass
-class EtcdLockOptionV2:
-    lock_name: bytes
-    timeout: Optional[float]
-    ttl: Optional[int]

src/etcetra/v2/__init__.py

@@ -20,16 +20,17 @@
 import grpc
 from grpc.aio import Channel
 
-from .errors import grpc_exception_handler, match_grpc_error
-from .grpc_api import rpc_pb2, rpc_pb2_grpc
-from .grpc_api import v3lock_pb2, v3lock_pb2_grpc
-from .types import (
-    DeleteRangeRequestType, EtcdCredential, EtcdLockOptionV2 as EtcdLockOption, HostPortPair,
+from ..errors import grpc_exception_handler, match_grpc_error
+from ..grpc_api import rpc_pb2, rpc_pb2_grpc
+from ..grpc_api import v3lock_pb2, v3lock_pb2_grpc
+from ..types import (
+    DeleteRangeRequestType, EtcdCredential, HostPortPair,
     PutRequestType, RangeRequestSortOrder, RangeRequestSortTarget, RangeRequestType,
     TransactionRequest, TxnReturnType, TxnReturnValues, WatchCreateRequestFilterType,
     WatchEvent, WatchEventType,
 )
-from .client import (
+from .types import EtcdLockOption
+from ..client import (
     EtcdAuthUnaryUnaryInterceptor,
     EtcdAuthUnaryStreamInterceptor,
     EtcdAuthStreamUnaryInterceptor,

src/etcetra/client_v2.py renamed to src/etcetra/v2/client.py

@@ -0,0 +1,9 @@
+from typing import Optional
+from dataclasses import dataclass
+
+
+@dataclass
+class EtcdLockOption:
+    lock_name: bytes
+    timeout: Optional[float]
+    ttl: Optional[int]