From dbad9cc451bc949a32163c442d86307f726d3667 Mon Sep 17 00:00:00 2001 From: Bert Palm <bert.palm@ufz.de> Date: Tue, 16 Mar 2021 18:12:14 +0100 Subject: [PATCH] renamed common.py to constants.py --- saqc/__init__.py | 2 +- saqc/{common.py => constants.py} | 0 saqc/core/core.py | 2 +- saqc/core/modules/flagtools.py | 2 +- saqc/core/modules/interpolation.py | 2 +- saqc/core/register.py | 2 +- saqc/core/visitor.py | 2 +- saqc/flagger/flags.py | 2 +- saqc/flagger/history.py | 2 +- saqc/funcs/changepoints.py | 2 +- saqc/funcs/flagtools.py | 2 +- saqc/funcs/generic.py | 2 +- saqc/funcs/interpolation.py | 2 +- saqc/funcs/outliers.py | 2 +- saqc/funcs/resampling.py | 2 +- saqc/funcs/scores.py | 2 +- saqc/funcs/tools.py | 2 +- saqc/lib/plotting.py | 2 +- tests/common.py | 2 +- tests/core/test_core.py | 2 +- tests/flagger/test_flags.py | 2 +- tests/funcs/test_constants_detection.py | 2 +- tests/funcs/test_functions.py | 2 +- tests/funcs/test_generic_api_functions.py | 2 +- tests/funcs/test_generic_config_functions.py | 2 +- tests/funcs/test_pattern_rec.py | 2 +- tests/funcs/test_proc_functions.py | 2 +- tests/funcs/test_spikes_detection.py | 2 +- tests/fuzzy/init.py | 2 +- tests/fuzzy/test_masking.py | 2 +- 30 files changed, 29 insertions(+), 29 deletions(-) rename saqc/{common.py => constants.py} (100%) diff --git a/saqc/__init__.py b/saqc/__init__.py index 0c2bb6d4b..d7155f47a 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 058ed9c18..3d4a7517c 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 c9c1b0892..637dc6f85 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 c73da2563..42db500c2 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 23ec179a4..817f3b559 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 560d87748..c517261e0 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 537cf9178..f5e36cc44 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 551dba6c4..72a573bd1 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 00d201f77..200711da4 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 c9227a7d4..5c2b341a9 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 862b3b981..4678bec62 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 a615aee92..5f59e2189 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 818a80ed0..ab486487d 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 3a4d8ce78..d8469586e 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 bdc27b597..1a49f4e1e 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 3e49f762b..edbb4c80c 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 c03670b5c..5f79f28bb 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 f61ddac3e..3e70ff349 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 cddc2fd59..b9773a473 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 652022048..db40b7e6c 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 1ae7be198..da7b83836 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 bbaa20ad5..47c8ae9d2 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 d581c4344..8c3ce15ff 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 6e84e6a99..fe8242cd2 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 3ca69d707..b434e3c24 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 31337badc..d7cada078 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 578dd9c44..faa256068 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 adbbffdc5..ad93f02c6 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 9d45520eb..cc7637099 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 -- GitLab