From 3779166dde32992b57dd1b13bfd08100286a1045 Mon Sep 17 00:00:00 2001 From: Fabian Diet Date: Fri, 18 Oct 2024 10:57:46 +0200 Subject: [PATCH] Rename yamcs.client.link to yamcs.client.links --- yamcs-client/src/yamcs/client/__init__.py | 4 ++-- yamcs-client/src/yamcs/client/core/__init__.py | 4 ++-- yamcs-client/src/yamcs/client/{link => links}/__init__.py | 0 yamcs-client/src/yamcs/client/{link => links}/client.py | 2 +- yamcs-client/src/yamcs/client/{link => links}/model.py | 0 yamcs-client/src/yamcs/link/client.py | 2 +- yamcs-client/src/yamcs/link/model.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename yamcs-client/src/yamcs/client/{link => links}/__init__.py (100%) rename yamcs-client/src/yamcs/client/{link => links}/client.py (99%) rename yamcs-client/src/yamcs/client/{link => links}/model.py (100%) diff --git a/yamcs-client/src/yamcs/client/__init__.py b/yamcs-client/src/yamcs/client/__init__.py index c6212ec..35e1e7b 100644 --- a/yamcs-client/src/yamcs/client/__init__.py +++ b/yamcs-client/src/yamcs/client/__init__.py @@ -12,8 +12,8 @@ from yamcs.client.core.subscriptions import * # noqa from yamcs.client.filetransfer.client import * # noqa from yamcs.client.filetransfer.model import * # noqa -from yamcs.client.link.client import * # noqa -from yamcs.client.link.model import * # noqa +from yamcs.client.links.client import * # noqa +from yamcs.client.links.model import * # noqa from yamcs.client.mdb.client import * # noqa from yamcs.client.mdb.model import * # noqa from yamcs.client.model import * # noqa diff --git a/yamcs-client/src/yamcs/client/core/__init__.py b/yamcs-client/src/yamcs/client/core/__init__.py index 1fdc226..f731ffc 100644 --- a/yamcs-client/src/yamcs/client/core/__init__.py +++ b/yamcs-client/src/yamcs/client/core/__init__.py @@ -57,7 +57,7 @@ if TYPE_CHECKING: from yamcs.client.archive.client import ArchiveClient from yamcs.client.filetransfer.client import FileTransferClient - from yamcs.client.link.client import LinkClient + from yamcs.client.links.client import LinkClient from yamcs.client.mdb.client import MDBClient from yamcs.client.storage.client import StorageClient from yamcs.client.tco.client import TCOClient @@ -494,7 +494,7 @@ def get_link(self, instance: str, link: str) -> "LinkClient": :param link: A link name within that instance. """ - from yamcs.client.link.client import LinkClient + from yamcs.client.links.client import LinkClient return LinkClient(self.ctx, instance, link) diff --git a/yamcs-client/src/yamcs/client/link/__init__.py b/yamcs-client/src/yamcs/client/links/__init__.py similarity index 100% rename from yamcs-client/src/yamcs/client/link/__init__.py rename to yamcs-client/src/yamcs/client/links/__init__.py diff --git a/yamcs-client/src/yamcs/client/link/client.py b/yamcs-client/src/yamcs/client/links/client.py similarity index 99% rename from yamcs-client/src/yamcs/client/link/client.py rename to yamcs-client/src/yamcs/client/links/client.py index 041b0a4..869e2cf 100644 --- a/yamcs-client/src/yamcs/client/link/client.py +++ b/yamcs-client/src/yamcs/client/links/client.py @@ -5,7 +5,7 @@ from yamcs.client.core.context import Context from yamcs.client.core.futures import WebSocketSubscriptionFuture from yamcs.client.core.subscriptions import WebSocketSubscriptionManager -from yamcs.client.link.model import Cop1Config, Cop1Status +from yamcs.client.links.model import Cop1Config, Cop1Status from yamcs.client.model import Link from yamcs.protobuf.cop1 import cop1_pb2 from yamcs.protobuf.links import links_pb2 diff --git a/yamcs-client/src/yamcs/client/link/model.py b/yamcs-client/src/yamcs/client/links/model.py similarity index 100% rename from yamcs-client/src/yamcs/client/link/model.py rename to yamcs-client/src/yamcs/client/links/model.py diff --git a/yamcs-client/src/yamcs/link/client.py b/yamcs-client/src/yamcs/link/client.py index b3372b4..65a3b78 100644 --- a/yamcs-client/src/yamcs/link/client.py +++ b/yamcs-client/src/yamcs/link/client.py @@ -3,4 +3,4 @@ Avoid use. """ -from yamcs.client.link.client import Cop1Subscription, LinkClient # noqa +from yamcs.client.links.client import Cop1Subscription, LinkClient # noqa diff --git a/yamcs-client/src/yamcs/link/model.py b/yamcs-client/src/yamcs/link/model.py index 248f36d..2e550e7 100644 --- a/yamcs-client/src/yamcs/link/model.py +++ b/yamcs-client/src/yamcs/link/model.py @@ -3,4 +3,4 @@ Avoid use. """ -from yamcs.client.link.model import Cop1Config, Cop1Status # noqa +from yamcs.client.links.model import Cop1Config, Cop1Status # noqa