Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

syncing with upstream a bit #65

Merged
merged 6 commits into from
Dec 19, 2024
Merged

syncing with upstream a bit #65

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7b85bf
using get_test_asset_path everywhere in tests
Eldies Dec 18, 2024
08c847d
moving cli to integration/cli
Eldies Dec 18, 2024
a97909d
moving most tests to unit
Eldies Dec 18, 2024
6a7956d
pylint fixes
Eldies Dec 18, 2024
eca889f
moving make_sample_video to tests/utils/video.py
Eldies Dec 18, 2024
7089eb5
removing ASSETS_DIR var
Eldies Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 tests/cli/__init__.py → tests/integration/__init__.py
View file
Open in desktop
File renamed without changes.
Empty file added tests/integration/cli/__init__.py
View file
Open in desktop
Empty file.
3 changes: 1 addition & 2 deletions tests/cli/test_diff.py → tests/integration/cli/test_compare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
from datumaro.components.operations import DistanceComparator
from datumaro.components.project import Dataset

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir
from tests.utils.test_utils import run_datum as run

Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_describe_downloads.py → ...ntegration/cli/test_describe_downloads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
from datumaro.components.extractor_tfds import AVAILABLE_TFDS_DATASETS, TFDS_EXTRACTOR_AVAILABLE
from datumaro.util import parse_json

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir, mock_tfds_data
from tests.utils.test_utils import run_datum as run

Expand Down
7 changes: 4 additions & 3 deletions tests/cli/test_detect_format.py → tests/integration/cli/test_detect_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
from datumaro.util.os_util import suppress_output

from tests.requirements import Requirements, mark_requirement
from tests.utils.assets import get_test_asset_path
from tests.utils.test_utils import TestDir
from tests.utils.test_utils import run_datum as run

ADE20K2017_DIR = osp.join(osp.dirname(__file__), "../assets/ade20k2017_dataset/dataset")
ADE20K2020_DIR = osp.join(osp.dirname(__file__), "../assets/ade20k2020_dataset/dataset")
LFW_DIR = osp.join(osp.dirname(__file__), "../assets/lfw_dataset")
ADE20K2017_DIR = get_test_asset_path("ade20k2017_dataset", "dataset")
ADE20K2020_DIR = get_test_asset_path("ade20k2020_dataset", "dataset")
LFW_DIR = get_test_asset_path("lfw_dataset")


class DetectFormatTest(TestCase):
Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_download.py → tests/integration/cli/test_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
from datumaro.components.dataset import Dataset
from datumaro.components.extractor_tfds import AVAILABLE_TFDS_DATASETS, TFDS_EXTRACTOR_AVAILABLE

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir, compare_datasets, mock_tfds_data
from tests.utils.test_utils import run_datum as run

Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_filter.py → tests/integration/cli/test_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
from datumaro.components.project import Project
from datumaro.util.scope import scope_add, scoped

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir, compare_datasets
from tests.utils.test_utils import run_datum as run

Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_generator.py → tests/integration/cli/test_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@

import datumaro.util.image as image_module

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir
from tests.utils.test_utils import run_datum as run

Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_image_zip_format.py → .../integration/cli/test_image_zip_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
from datumaro.components.dataset import Dataset, DatasetItem
from datumaro.components.media import Image

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir, compare_datasets
from tests.utils.test_utils import run_datum as run

Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_info.py → tests/integration/cli/test_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@

from datumaro.util import parse_json

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import run_datum

DUMMY_DATASET_DIR = osp.join(
Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_kitti_raw_format.py → .../integration/cli/test_kitti_raw_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
from datumaro.components.extractor import DatasetItem
from datumaro.components.media import Image, PointCloud

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir, compare_datasets_3d
from tests.utils.test_utils import run_datum as run

Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_merge.py → tests/integration/cli/test_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
from datumaro.components.media import Image
from datumaro.components.project import Dataset, Project

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir, compare_datasets
from tests.utils.test_utils import run_datum as run

Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_patch.py → tests/integration/cli/test_patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
from datumaro.components.media import Image
from datumaro.components.project import Dataset, Project

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir, compare_datasets
from tests.utils.test_utils import run_datum as run

Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_project.py → tests/integration/cli/test_project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
from datumaro.components.project import Project
from datumaro.util.scope import scope_add, scoped

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir, compare_datasets, compare_dirs
from tests.utils.test_utils import run_datum as run

Expand Down
5 changes: 2 additions & 3 deletions tests/cli/test_revpath.py → tests/integration/cli/test_revpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
from datumaro.components.project import Project
from datumaro.util.scope import scope_add, scoped

from ..conftest import ASSETS_DIR
from ..requirements import Requirements, mark_requirement

from tests.conftest import ASSETS_DIR
from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir


Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_sly_point_cloud_format.py → ...ration/cli/test_sly_point_cloud_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
from datumaro.components.extractor import DatasetItem
from datumaro.components.media import Image, PointCloud

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir, compare_datasets_3d
from tests.utils.test_utils import run_datum as run

Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_transform.py → tests/integration/cli/test_transform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
from datumaro.components.project import Project
from datumaro.util.scope import scope_add, scoped

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir, compare_datasets
from tests.utils.test_utils import run_datum as run

Expand Down
5 changes: 2 additions & 3 deletions tests/cli/test_utils.py → tests/integration/cli/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
from datumaro.components.media_manager import MediaManager
from datumaro.util.scope import on_exit_do, scope_add, scoped

from ..requirements import Requirements, mark_requirement
from ..test_video import make_sample_video # pylint: disable=unused-import

from tests.requirements import Requirements, mark_requirement
from tests.unit.test_video import make_sample_video # pylint: disable=unused-import
from tests.utils.test_utils import TestDir
from tests.utils.test_utils import run_datum as run

Expand Down
5 changes: 2 additions & 3 deletions tests/cli/test_video.py → tests/integration/cli/test_video.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
import os.path as osp
from unittest import TestCase

from ..requirements import Requirements, mark_requirement

from tests.test_video import make_sample_video
from tests.requirements import Requirements, mark_requirement
from tests.unit.test_video import make_sample_video
from tests.utils.test_utils import TestDir
from tests.utils.test_utils import run_datum as run

Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_voc_format.py → tests/integration/cli/test_voc_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
from datumaro.components.dataset import Dataset, DatasetItem
from datumaro.components.media import Image

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir, compare_datasets
from tests.utils.test_utils import run_datum as run

Expand Down
3 changes: 1 addition & 2 deletions tests/cli/test_yolo_format.py → tests/integration/cli/test_yolo_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
from datumaro.components.extractor import DatasetItem
from datumaro.components.media import Image

from ..requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.test_utils import TestDir, compare_datasets
from tests.utils.test_utils import run_datum as run

Expand Down
Empty file added tests/unit/algorithms/__init__.py
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion tests/test_RISE.py → tests/unit/algorithms/test_RISE.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from datumaro.components.annotation import Bbox, Label
from datumaro.components.launcher import Launcher

from .requirements import Requirements, mark_requirement
from tests.requirements import Requirements, mark_requirement


class RiseTest(TestCase):
Expand Down
Empty file added tests/unit/data_formats/datumaro/__init__.py
View file
Open in desktop
Empty file.
8 changes: 4 additions & 4 deletions tests/test_datumaro_format.py → ..._formats/datumaro/test_datumaro_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
from datumaro.util import parse_json_file
from datumaro.util.mask_tools import generate_colormap

from .requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.assets import get_test_asset_path
from tests.utils.test_utils import (
Dimensions,
TestDir,
Expand Down Expand Up @@ -203,7 +203,7 @@ def test_can_save_and_load_with_no_save_media(self):

@mark_requirement(Requirements.DATUM_GENERAL_REQ)
def test_can_import_pcd_dataset(self):
dataset_path = str(Path(__file__).parent / "assets" / "datumaro_dataset" / "with_pcd")
dataset_path = get_test_asset_path("datumaro_dataset", "with_pcd")

label_categories = LabelCategories(attributes={"occluded"})
label_categories.add("cat")
Expand Down Expand Up @@ -254,7 +254,7 @@ def test_can_import_pcd_dataset(self):

@mark_requirement(Requirements.DATUM_GENERAL_REQ)
def test_can_import_skeleton_dataset(self):
dataset_path = str(Path(__file__).parent / "assets" / "datumaro_dataset" / "with_skeleton")
dataset_path = get_test_asset_path("datumaro_dataset", "with_skeleton")

label_categories = LabelCategories.from_iterable(
[
Expand Down
12 changes: 4 additions & 8 deletions ...st_common_semantic_segmentation_format.py → ...st_common_semantic_segmentation_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,13 @@
make_categories,
)

from .requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.assets import get_test_asset_path
from tests.utils.test_utils import compare_datasets

DUMMY_DATASET_DIR = osp.join(
osp.dirname(__file__), "assets", "common_semantic_segmentation_dataset", "dataset"
)
DUMMY_DATASET_DIR = get_test_asset_path("common_semantic_segmentation_dataset", "dataset")

DUMMY_NON_STANDARD_DATASET_DIR = osp.join(
osp.dirname(__file__),
"assets",
DUMMY_NON_STANDARD_DATASET_DIR = get_test_asset_path(
"common_semantic_segmentation_dataset",
"non_standard_dataset",
)
Expand Down
12 changes: 6 additions & 6 deletions tests/test_mapillary_vistas_format.py → ...a_formats/test_mapillary_vistas_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
make_mapillary_instance_categories,
)

from .requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.assets import get_test_asset_path
from tests.utils.test_utils import TestDir, compare_datasets

DUMMY_DATASET_V1_2 = osp.join(osp.dirname(__file__), "assets", "mapillary_vistas_dataset", "v1.2")
DUMMY_DATASET_V2_0 = osp.join(osp.dirname(__file__), "assets", "mapillary_vistas_dataset", "v2.0")
DUMMY_DATASET_WITH_META_FILE = osp.join(
osp.dirname(__file__), "assets", "mapillary_vistas_dataset", "dataset_with_meta_file"
DUMMY_DATASET_V1_2 = get_test_asset_path("mapillary_vistas_dataset", "v1.2")
DUMMY_DATASET_V2_0 = get_test_asset_path("mapillary_vistas_dataset", "v2.0")
DUMMY_DATASET_WITH_META_FILE = get_test_asset_path(
"mapillary_vistas_dataset", "dataset_with_meta_file"
)


Expand Down
20 changes: 7 additions & 13 deletions tests/test_synthia_format.py → .../unit/data_formats/test_synthia_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,19 @@
from datumaro.components.extractor import DatasetItem
from datumaro.components.media import Image

from .requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.assets import get_test_asset_path
from tests.utils.test_utils import compare_datasets

DUMMY_LABELS_SEGM_DATASET_DIR = osp.join(
osp.dirname(__file__), "assets", "synthia_dataset", "labels_segm_dataset"
)
DUMMY_LABELS_SEGM_DATASET_DIR = get_test_asset_path("synthia_dataset", "labels_segm_dataset")

DUMMY_COLOR_SEGM_DATASET_DIR = osp.join(
osp.dirname(__file__), "assets", "synthia_dataset", "color_segm_dataset"
)
DUMMY_COLOR_SEGM_DATASET_DIR = get_test_asset_path("synthia_dataset", "color_segm_dataset")

DUMMY_DATASET_DIR_CUSTOM_LABELMAP = osp.join(
osp.dirname(__file__), "assets", "synthia_dataset", "dataset_with_custom_labelmap"
DUMMY_DATASET_DIR_CUSTOM_LABELMAP = get_test_asset_path(
"synthia_dataset", "dataset_with_custom_labelmap"
)

DUMMY_DATASET_DIR_META_FILE = osp.join(
osp.dirname(__file__), "assets", "synthia_dataset", "dataset_with_meta_file"
)
DUMMY_DATASET_DIR_META_FILE = get_test_asset_path("synthia_dataset", "dataset_with_meta_file")


class SynthiaImporterTest(TestCase):
Expand Down
7 changes: 3 additions & 4 deletions tests/test_ade20k2017_format.py → tests/unit/test_ade20k2017_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@
from datumaro.plugins.ade20k2017_format import Ade20k2017Importer

from tests.requirements import Requirements, mark_requirement
from tests.utils.assets import get_test_asset_path
from tests.utils.test_utils import compare_datasets

DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "ade20k2017_dataset", "dataset")
DUMMY_DATASET_DIR = get_test_asset_path("ade20k2017_dataset", "dataset")

DUMMY_DATASET_DIR_META_FILE = osp.join(
osp.dirname(__file__), "assets", "ade20k2017_dataset", "dataset_with_meta_file"
)
DUMMY_DATASET_DIR_META_FILE = get_test_asset_path("ade20k2017_dataset", "dataset_with_meta_file")


class Ade20k2017ImporterTest(TestCase):
Expand Down
7 changes: 3 additions & 4 deletions tests/test_ade20k2020_format.py → tests/unit/test_ade20k2020_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@
from datumaro.plugins.ade20k2020_format import Ade20k2020Importer

from tests.requirements import Requirements, mark_requirement
from tests.utils.assets import get_test_asset_path
from tests.utils.test_utils import compare_datasets

DUMMY_DATASET_DIR = osp.join(osp.dirname(__file__), "assets", "ade20k2020_dataset", "dataset")
DUMMY_DATASET_DIR = get_test_asset_path("ade20k2020_dataset", "dataset")

DUMMY_DATASET_DIR_META_FILE = osp.join(
osp.dirname(__file__), "assets", "ade20k2020_dataset", "dataset_with_meta_file"
)
DUMMY_DATASET_DIR_META_FILE = get_test_asset_path("ade20k2020_dataset", "dataset_with_meta_file")


class Ade20k2020ImporterTest(TestCase):
Expand Down
12 changes: 5 additions & 7 deletions tests/test_align_celeba_format.py → tests/unit/test_align_celeba_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@
from datumaro.components.media import Image
from datumaro.plugins.align_celeba_format import AlignCelebaImporter

from .requirements import Requirements, mark_requirement

from tests.requirements import Requirements, mark_requirement
from tests.utils.assets import get_test_asset_path
from tests.utils.test_utils import compare_datasets

DUMMY_ALIGN_DATASET_DIR = osp.join(
osp.dirname(__file__), "assets", "align_celeba_dataset", "dataset"
)
DUMMY_ALIGN_DATASET_DIR_WITH_META_FILE = osp.join(
osp.dirname(__file__), "assets", "align_celeba_dataset", "dataset_with_meta_file"
DUMMY_ALIGN_DATASET_DIR = get_test_asset_path("align_celeba_dataset", "dataset")
DUMMY_ALIGN_DATASET_DIR_WITH_META_FILE = get_test_asset_path(
"align_celeba_dataset", "dataset_with_meta_file"
)


Expand Down
2 changes: 1 addition & 1 deletion tests/test_annotation_util.py → tests/unit/test_annotation_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from datumaro.components.annotation import Bbox, Mask, Polygon
from datumaro.util.annotation_util import SpatialAnnotation, get_bbox, segment_iou

from .requirements import Requirements, mark_requirement
from tests.requirements import Requirements, mark_requirement


class SegmentIouTest:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_api.py → tests/unit/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: MIT

from .requirements import Requirements, mark_requirement
from tests.requirements import Requirements, mark_requirement


class ApiTest:
Expand Down
Loading
Loading