diff --git a/saqc/__init__.py b/saqc/__init__.py index 0c2bb6d4b68a2234e708e40fc693af29724a7826..d7155f47acb228ad2215d8a4dd283351860b1299 100644 --- a/saqc/__init__.py +++ b/saqc/__init__.py @@ -4,7 +4,7 @@ __version__ = "1.4" # import order: from small to big -from saqc.common import * +from saqc.constants import * from saqc.flagger import * from saqc.core.register import register from saqc.core.core import SaQC diff --git a/saqc/common.py b/saqc/constants.py similarity index 100% rename from saqc/common.py rename to saqc/constants.py diff --git a/saqc/core/core.py b/saqc/core/core.py index 058ed9c18b6241f910af45ea9202d24e439bdf84..3d4a7517c70e35bb9c3132adeb31aede9881dc23 100644 --- a/saqc/core/core.py +++ b/saqc/core/core.py @@ -17,7 +17,7 @@ import numpy as np import timeit import inspect -from saqc.common import * +from saqc.constants import * from saqc.flagger import initFlagsLike, Flagger from saqc.core.lib import APIController, ColumnSelector from saqc.core.register import FUNC_MAP, SaQCFunction diff --git a/saqc/core/modules/flagtools.py b/saqc/core/modules/flagtools.py index c9c1b089278b8cec4bcf4a34f7a3185cdf8f07fd..637dc6f853e7170abf980dce7096ab6e5d87bf37 100644 --- a/saqc/core/modules/flagtools.py +++ b/saqc/core/modules/flagtools.py @@ -8,7 +8,7 @@ import pandas as pd from dios.dios import DictOfSeries from saqc.core.modules.base import ModuleBase -from saqc.common import * +from saqc.constants import * class FlagTools(ModuleBase): diff --git a/saqc/core/modules/interpolation.py b/saqc/core/modules/interpolation.py index c73da2563e95223af769a480b7b60da92ff2ebdf..42db500c29c7e6570cd4379b06f97d5e2162069e 100644 --- a/saqc/core/modules/interpolation.py +++ b/saqc/core/modules/interpolation.py @@ -7,7 +7,7 @@ from typing_extensions import Literal import numpy as np import pandas as pd -from saqc.common import * +from saqc.constants import * from saqc.core.modules.base import ModuleBase diff --git a/saqc/core/register.py b/saqc/core/register.py index 23ec179a400672f68fa868ac39c995d959a06dac..817f3b559ad3f57899f027191e2afd3fc9d36979 100644 --- a/saqc/core/register.py +++ b/saqc/core/register.py @@ -9,7 +9,7 @@ import pandas as pd import dios import warnings -from saqc.common import * +from saqc.constants import * from saqc.core.lib import SaQCFunction from saqc.lib.types import FuncReturnT from saqc.flagger.flags import Flagger, initFlagsLike diff --git a/saqc/core/visitor.py b/saqc/core/visitor.py index 560d87748c48e4154b342e7327af3b7f1d805ce6..c517261e0318a0a1bee0bef6423bdb139070fb68 100644 --- a/saqc/core/visitor.py +++ b/saqc/core/visitor.py @@ -6,7 +6,7 @@ import ast import numpy as np import pandas as pd -from saqc.common import * +from saqc.constants import * from saqc.core.register import FUNC_MAP import saqc.lib.ts_operators as ts_ops diff --git a/saqc/flagger/flags.py b/saqc/flagger/flags.py index 537cf91783b9abfed504e0d8a7ee94fd09e2d19b..f5e36cc44b21036bd6fcdd88b1fc7fc980c904f0 100644 --- a/saqc/flagger/flags.py +++ b/saqc/flagger/flags.py @@ -3,7 +3,7 @@ from __future__ import annotations import dios -from saqc.common import * +from saqc.constants import * from saqc.flagger.history import History import pandas as pd from typing import Union, Dict, DefaultDict, Optional, Type, Tuple, Iterable diff --git a/saqc/flagger/history.py b/saqc/flagger/history.py index 551dba6c4645c317496b5c07cbd28d61a0224d58..72a573bd1e6fca6f0f4c330a68b659b0afdad39b 100644 --- a/saqc/flagger/history.py +++ b/saqc/flagger/history.py @@ -4,7 +4,7 @@ from __future__ import annotations from typing import Tuple, Type import pandas as pd import numpy as np -from saqc.common import * +from saqc.constants import * class History: diff --git a/saqc/funcs/changepoints.py b/saqc/funcs/changepoints.py index 00d201f7772912c1b1883e26ad531f67fe785fc5..200711da4b87d2382cc27b3298c179f1be5c29e3 100644 --- a/saqc/funcs/changepoints.py +++ b/saqc/funcs/changepoints.py @@ -11,7 +11,7 @@ from typing_extensions import Literal from dios import DictOfSeries -from saqc.common import * +from saqc.constants import * from saqc.core.register import register from saqc.lib.tools import customRoller from saqc.flagger import Flagger diff --git a/saqc/funcs/flagtools.py b/saqc/funcs/flagtools.py index c9227a7d43effd917dd20325298645f62ade0a09..5c2b341a97cf2d572dd83e63d23bdee3691c8e1c 100644 --- a/saqc/funcs/flagtools.py +++ b/saqc/funcs/flagtools.py @@ -7,7 +7,7 @@ import pandas as pd from dios import DictOfSeries -from saqc.common import * +from saqc.constants import * from saqc.lib.types import * from saqc.core.register import register from saqc.flagger import Flagger diff --git a/saqc/funcs/generic.py b/saqc/funcs/generic.py index 862b3b98171f6fababe8d5bd6cfd19367cb125d6..4678bec624126d65f04f397e4f4bd8a472c294d4 100644 --- a/saqc/funcs/generic.py +++ b/saqc/funcs/generic.py @@ -10,7 +10,7 @@ import pandas as pd from dios import DictOfSeries -from saqc.common import * +from saqc.constants import * from saqc.core.register import register from saqc.core.visitor import ENVIRONMENT from saqc.flagger import Flagger, initFlagsLike diff --git a/saqc/funcs/interpolation.py b/saqc/funcs/interpolation.py index a615aee92ed3bd43a29dc6d710ba3bd931749c66..5f59e21898986c9aeef24a4e0e81f511581183a7 100644 --- a/saqc/funcs/interpolation.py +++ b/saqc/funcs/interpolation.py @@ -9,7 +9,7 @@ import pandas as pd from dios import DictOfSeries -from saqc.common import * +from saqc.constants import * from saqc.core.register import register from saqc.flagger import Flagger diff --git a/saqc/funcs/outliers.py b/saqc/funcs/outliers.py index 818a80ed02bd59697b93a082740626ec7a2a1af8..ab486487d692419535bc2b88bac3107a001cfa68 100644 --- a/saqc/funcs/outliers.py +++ b/saqc/funcs/outliers.py @@ -14,7 +14,7 @@ from outliers import smirnov_grubbs from dios import DictOfSeries -from saqc.common import * +from saqc.constants import * from saqc.core.register import register from saqc.flagger import Flagger from saqc.lib.tools import ( diff --git a/saqc/funcs/resampling.py b/saqc/funcs/resampling.py index 3a4d8ce78cfd4ecdb7de539c70a0ca7686be9189..d8469586e2a9898cb653df8a3fc30dcd775ab85c 100644 --- a/saqc/funcs/resampling.py +++ b/saqc/funcs/resampling.py @@ -11,7 +11,7 @@ import pandas as pd from dios import DictOfSeries -from saqc.common import * +from saqc.constants import * from saqc.core.register import register from saqc.flagger import Flagger, initFlagsLike, History from saqc.funcs.tools import copy, drop, rename diff --git a/saqc/funcs/scores.py b/saqc/funcs/scores.py index bdc27b5973dfe5d17bb48c73f08ab6dfb9758275..1a49f4e1e101da726dfe70ad42e00d32f022fd72 100644 --- a/saqc/funcs/scores.py +++ b/saqc/funcs/scores.py @@ -8,7 +8,7 @@ import pandas as pd from dios import DictOfSeries -from saqc.common import * +from saqc.constants import * from saqc.core.register import register from saqc.flagger import Flagger from saqc.lib import ts_operators as ts_ops diff --git a/saqc/funcs/tools.py b/saqc/funcs/tools.py index 3e49f762b714e921ec9aefa0142c931ee21b0ba2..edbb4c80c7e25833b08a8f2a854e1eae207037e0 100644 --- a/saqc/funcs/tools.py +++ b/saqc/funcs/tools.py @@ -8,7 +8,7 @@ import numpy as np from dios import DictOfSeries -from saqc.common import * +from saqc.constants import * from saqc.core.register import register from saqc.flagger import Flagger from saqc.lib.tools import periodicMask diff --git a/saqc/lib/plotting.py b/saqc/lib/plotting.py index c03670b5cbf346f5c39904399be9227d07787ec8..5f79f28bb5932ee67044e706c0d3cc39d09c6db9 100644 --- a/saqc/lib/plotting.py +++ b/saqc/lib/plotting.py @@ -8,7 +8,7 @@ import pandas as pd import dios import matplotlib.pyplot as plt from typing import List, Dict, Optional -from saqc.common import * +from saqc.constants import * from saqc.flagger import Flagger diff --git a/tests/common.py b/tests/common.py index f61ddac3e34a142049a383ec6bb7fab870f92acd..3e70ff349fb2ae082ef4a3b14b00c89f65a86a97 100644 --- a/tests/common.py +++ b/tests/common.py @@ -6,7 +6,7 @@ import numpy as np import pandas as pd import dios -from saqc.common import * +from saqc.constants import * from saqc.flagger import Flagger, initFlagsLike diff --git a/tests/core/test_core.py b/tests/core/test_core.py index cddc2fd59d700157475efc9be93c84d5fffd6e5c..b9773a4731aab4abb5373ca0569ce35237c9bd32 100644 --- a/tests/core/test_core.py +++ b/tests/core/test_core.py @@ -6,7 +6,7 @@ import pytest import numpy as np import pandas as pd -from saqc.common import * +from saqc.constants import * from saqc.flagger import initFlagsLike from saqc.funcs import flagRange from saqc.lib import plotting as splot diff --git a/tests/flagger/test_flags.py b/tests/flagger/test_flags.py index 6520220482f0cb1b21988fc47188dc293c85ef73..db40b7e6c013ea13d8fe88f8b8050cda795432a5 100644 --- a/tests/flagger/test_flags.py +++ b/tests/flagger/test_flags.py @@ -4,7 +4,7 @@ import pytest import numpy as np import pandas as pd -from saqc.common import * +from saqc.constants import * from saqc.flagger.flags import Flags from tests.flagger.test_history import ( diff --git a/tests/funcs/test_constants_detection.py b/tests/funcs/test_constants_detection.py index 1ae7be1986a58920738ba809d1ae23506d06889b..da7b83836f9f38581a8480bde07a97cc0bff8757 100644 --- a/tests/funcs/test_constants_detection.py +++ b/tests/funcs/test_constants_detection.py @@ -4,7 +4,7 @@ import pytest import numpy as np -from saqc.common import * +from saqc.constants import * from saqc.funcs.constants import flagConstants, flagByVariance from saqc.flagger import initFlagsLike diff --git a/tests/funcs/test_functions.py b/tests/funcs/test_functions.py index bbaa20ad5fa8da76ea06e78c8c82c801a31baea5..47c8ae9d22f70bb4ecb5f489bc70f69f4ade723e 100644 --- a/tests/funcs/test_functions.py +++ b/tests/funcs/test_functions.py @@ -3,7 +3,7 @@ import dios -from saqc.common import * +from saqc.constants import * from saqc.flagger import initFlagsLike from saqc.funcs.drift import flagDriftFromNorm, flagDriftFromReference, flagDriftFromScaledNorm from saqc.funcs.outliers import flagCrossStatistic, flagRange diff --git a/tests/funcs/test_generic_api_functions.py b/tests/funcs/test_generic_api_functions.py index d581c4344d7580fa9c0bec3ba5fb36a6efe6147e..8c3ce15ff3289c440d0e37a6254e26371ced22b8 100644 --- a/tests/funcs/test_generic_api_functions.py +++ b/tests/funcs/test_generic_api_functions.py @@ -4,7 +4,7 @@ import pytest import pandas as pd -from saqc.common import * +from saqc.constants import * from saqc.core.register import register from saqc.funcs.tools import mask from saqc import SaQC diff --git a/tests/funcs/test_generic_config_functions.py b/tests/funcs/test_generic_config_functions.py index 6e84e6a994b41c0ba2a372802884cb4fccd8ff70..fe8242cd2662708c428a40cefc376867ab2621a8 100644 --- a/tests/funcs/test_generic_config_functions.py +++ b/tests/funcs/test_generic_config_functions.py @@ -7,7 +7,7 @@ import numpy as np import pandas as pd import dios -from saqc.common import * +from saqc.constants import * from saqc.flagger import Flagger, initFlagsLike from saqc.core.visitor import ConfigFunctionParser from saqc.core.config import Fields as F diff --git a/tests/funcs/test_pattern_rec.py b/tests/funcs/test_pattern_rec.py index 3ca69d7072ec6414a0503144d586462cfffb6cb4..b434e3c240e34c2ed71ab1bf6520ca7dfec38300 100644 --- a/tests/funcs/test_pattern_rec.py +++ b/tests/funcs/test_pattern_rec.py @@ -5,7 +5,7 @@ import pytest import pandas as pd import dios -from saqc.common import * +from saqc.constants import * from saqc.flagger import initFlagsLike from saqc.funcs.pattern import * from tests.common import initData diff --git a/tests/funcs/test_proc_functions.py b/tests/funcs/test_proc_functions.py index 31337badcfddcdd11c93c9d397c41577f213d4d0..d7cada07858fc9f9e1d8d11d70f6785313295e7e 100644 --- a/tests/funcs/test_proc_functions.py +++ b/tests/funcs/test_proc_functions.py @@ -6,7 +6,7 @@ import dios -from saqc.common import * +from saqc.constants import * from saqc.funcs.transformation import transform from saqc.funcs.drift import correctOffset from saqc.funcs.interpolation import interpolateByRolling, interpolateInvalid, interpolateIndex diff --git a/tests/funcs/test_spikes_detection.py b/tests/funcs/test_spikes_detection.py index 578dd9c446821adf6f2ef25ed9b1153f56d21d16..faa25606811d8acb7a74a73b9bf5c9a811e0982e 100644 --- a/tests/funcs/test_spikes_detection.py +++ b/tests/funcs/test_spikes_detection.py @@ -12,7 +12,7 @@ from saqc.funcs.outliers import ( flagMVScores, flagByGrubbs, ) -from saqc.common import * +from saqc.constants import * from saqc.flagger import initFlagsLike diff --git a/tests/fuzzy/init.py b/tests/fuzzy/init.py index adbbffdc5cd2df8920348cb400a938337eee8087..ad93f02c6ceecb966ce578656b6c63d8e8044642 100644 --- a/tests/fuzzy/init.py +++ b/tests/fuzzy/init.py @@ -21,7 +21,7 @@ from hypothesis.strategies import ( from hypothesis.extra.numpy import arrays, from_dtype from hypothesis.strategies._internal.types import _global_type_lookup -from saqc.common import * +from saqc.constants import * from saqc.core.register import FUNC_MAP from saqc.core.lib import SaQCFunction from saqc.lib.types import FreqString, ColumnName, IntegerWindow diff --git a/tests/fuzzy/test_masking.py b/tests/fuzzy/test_masking.py index 9d45520eb90d9dc4a4deb2f95045debd71d7c838..cc763709912bb5c0777edd2e2823280e2e019ba3 100644 --- a/tests/fuzzy/test_masking.py +++ b/tests/fuzzy/test_masking.py @@ -7,7 +7,7 @@ import pandas as pd from hypothesis import given, settings -from saqc.common import * +from saqc.constants import * from saqc.flagger import Flagger from saqc.core.register import _maskData, _unmaskData