From 3b31c2cbfdbb1737ea598136fb89c334bbaae7c2 Mon Sep 17 00:00:00 2001 From: unexcellent <> Date: Tue, 29 Oct 2024 15:54:40 +0100 Subject: [PATCH] refactor: move AttributeType --- raillabel/__init__.py | 2 +- raillabel/_util/__init__.py | 2 -- raillabel/{_util => format/raillabel}/_attribute_type.py | 0 raillabel/format/raillabel/_object_annotation.py | 2 +- raillabel/format/raillabel/element_data_pointer.py | 2 +- .../format/raillabel/test_element_data_pointer.py | 2 +- tests/test_raillabel/format/raillabel/test_object.py | 2 +- 7 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 raillabel/_util/__init__.py rename raillabel/{_util => format/raillabel}/_attribute_type.py (100%) diff --git a/raillabel/__init__.py b/raillabel/__init__.py index 3991e17..3ea3568 100644 --- a/raillabel/__init__.py +++ b/raillabel/__init__.py @@ -3,7 +3,7 @@ """Devkit for working with recorded and annotated train ride data from DB.""" from importlib import metadata -from . import _util, format +from . import format from .exceptions import * from .filter.filter import filter from .format import Scene diff --git a/raillabel/_util/__init__.py b/raillabel/_util/__init__.py deleted file mode 100644 index dd5d085..0000000 --- a/raillabel/_util/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright DB InfraGO AG and contributors -# SPDX-License-Identifier: Apache-2.0 diff --git a/raillabel/_util/_attribute_type.py b/raillabel/format/raillabel/_attribute_type.py similarity index 100% rename from raillabel/_util/_attribute_type.py rename to raillabel/format/raillabel/_attribute_type.py diff --git a/raillabel/format/raillabel/_object_annotation.py b/raillabel/format/raillabel/_object_annotation.py index 941ebdd..6bd484b 100644 --- a/raillabel/format/raillabel/_object_annotation.py +++ b/raillabel/format/raillabel/_object_annotation.py @@ -9,7 +9,7 @@ from pathlib import Path from pkgutil import iter_modules -from ..._util._attribute_type import AttributeType +from ._attribute_type import AttributeType from .object import Object from .sensor import Sensor diff --git a/raillabel/format/raillabel/element_data_pointer.py b/raillabel/format/raillabel/element_data_pointer.py index f0e03cd..0d30a00 100644 --- a/raillabel/format/raillabel/element_data_pointer.py +++ b/raillabel/format/raillabel/element_data_pointer.py @@ -4,7 +4,7 @@ import typing as t from dataclasses import dataclass -from ..._util._attribute_type import AttributeType +from ._attribute_type import AttributeType from .frame_interval import FrameInterval diff --git a/tests/test_raillabel/format/raillabel/test_element_data_pointer.py b/tests/test_raillabel/format/raillabel/test_element_data_pointer.py index 5ee07a4..d3f0eda 100644 --- a/tests/test_raillabel/format/raillabel/test_element_data_pointer.py +++ b/tests/test_raillabel/format/raillabel/test_element_data_pointer.py @@ -9,7 +9,7 @@ sys.path.insert(1, str(Path(__file__).parent.parent.parent.parent.parent)) -from raillabel._util._attribute_type import AttributeType +from raillabel.format.raillabel._attribute_type import AttributeType from raillabel.format import ElementDataPointer # == Fixtures ========================= diff --git a/tests/test_raillabel/format/raillabel/test_object.py b/tests/test_raillabel/format/raillabel/test_object.py index 647289f..bfccad5 100644 --- a/tests/test_raillabel/format/raillabel/test_object.py +++ b/tests/test_raillabel/format/raillabel/test_object.py @@ -12,7 +12,7 @@ sys.path.insert(1, str(Path(__file__).parent.parent.parent.parent.parent)) -from raillabel._util._attribute_type import AttributeType +from raillabel.format.raillabel._attribute_type import AttributeType from raillabel.format import ( Bbox, Cuboid,