From 3db5310af2e42362b59b5429336db4ae23f1781c Mon Sep 17 00:00:00 2001 From: zeptofine Date: Fri, 11 Aug 2023 02:41:39 -0400 Subject: [PATCH] move dataset filters to src this is preparation for a GUI project. --- create_dataset.py | 7 ++++--- dataset_filters/__init__.py | 3 --- src/__init__.py | 0 src/datafilters/__init__.py | 0 {dataset_filters => src/datafilters}/base_filters.py | 0 {dataset_filters => src/datafilters}/custom_toml.py | 0 {dataset_filters => src/datafilters}/data_filters.py | 0 {dataset_filters => src/datafilters}/dataset_builder.py | 0 {dataset_filters => src/datafilters}/external_filters.py | 0 9 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 dataset_filters/__init__.py create mode 100644 src/__init__.py create mode 100644 src/datafilters/__init__.py rename {dataset_filters => src/datafilters}/base_filters.py (100%) rename {dataset_filters => src/datafilters}/custom_toml.py (100%) rename {dataset_filters => src/datafilters}/data_filters.py (100%) rename {dataset_filters => src/datafilters}/dataset_builder.py (100%) rename {dataset_filters => src/datafilters}/external_filters.py (100%) diff --git a/create_dataset.py b/create_dataset.py index 35789f9..82a701f 100644 --- a/create_dataset.py +++ b/create_dataset.py @@ -14,9 +14,10 @@ from typer import Option from typing_extensions import Annotated -from dataset_filters.data_filters import BlacknWhitelistFilter, ExistingFilter, StatFilter -from dataset_filters.dataset_builder import DatasetBuilder -from dataset_filters.external_filters import ChannelFilter, HashFilter, ResFilter + +from src.datafilters.data_filters import BlacknWhitelistFilter, ExistingFilter, StatFilter +from src.datafilters.dataset_builder import DatasetBuilder +from src.datafilters.external_filters import ChannelFilter, HashFilter, ResFilter from util.file_list import get_file_list, to_recursive from util.print_funcs import RichStepper, ipbar diff --git a/dataset_filters/__init__.py b/dataset_filters/__init__.py deleted file mode 100644 index 92831f1..0000000 --- a/dataset_filters/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from .data_filters import * -from .dataset_builder import DatasetBuilder -from .external_filters import * diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/datafilters/__init__.py b/src/datafilters/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dataset_filters/base_filters.py b/src/datafilters/base_filters.py similarity index 100% rename from dataset_filters/base_filters.py rename to src/datafilters/base_filters.py diff --git a/dataset_filters/custom_toml.py b/src/datafilters/custom_toml.py similarity index 100% rename from dataset_filters/custom_toml.py rename to src/datafilters/custom_toml.py diff --git a/dataset_filters/data_filters.py b/src/datafilters/data_filters.py similarity index 100% rename from dataset_filters/data_filters.py rename to src/datafilters/data_filters.py diff --git a/dataset_filters/dataset_builder.py b/src/datafilters/dataset_builder.py similarity index 100% rename from dataset_filters/dataset_builder.py rename to src/datafilters/dataset_builder.py diff --git a/dataset_filters/external_filters.py b/src/datafilters/external_filters.py similarity index 100% rename from dataset_filters/external_filters.py rename to src/datafilters/external_filters.py