From a9ff49ef81f6bb0179819abd5c1be2ac99afa2e4 Mon Sep 17 00:00:00 2001
From: David Schaefer <david.schaefer@ufz.de>
Date: Tue, 8 Jun 2021 11:35:42 +0200
Subject: [PATCH] minor core cleanups
---
saqc/core/core.py | 20 +++-----------------
saqc/core/lib.py | 1 -
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/saqc/core/core.py b/saqc/core/core.py
index 905e0cf4d..583d5294a 100644
--- a/saqc/core/core.py
+++ b/saqc/core/core.py
@@ -2,45 +2,30 @@
# -*- coding: utf-8 -*-
from __future__ import annotations
-# TODO:
-# - integrate plotting into the api
-# - `data` and `flags` as arguments to `getResult`
-
import logging
+import inspect
import copy as stdcopy
-
-from saqc.lib.tools import toSequence
from typing import Tuple, Union, Optional
from typing_extensions import Literal
import pandas as pd
import numpy as np
-import inspect
-import matplotlib
-
from dios import DictOfSeries, to_dios
from saqc.core.flags import initFlagsLike, Flags
from saqc.core.lib import APIController, ColumnSelector
from saqc.core.register import FUNC_MAP, SaQCFunction
from saqc.core.modules import FuncModules
-
from saqc.core.translator.basetranslator import Translator, FloatTranslator
-from saqc.lib.types import ExternalFlag, CallGraph, MaterializedGraph, PandasLike
-
from saqc.constants import BAD
-from saqc.lib.plotting import makeFig
-
-from saqc.core.translator.basetranslator import Translator, FloatTranslator
+from saqc.lib.tools import toSequence
from saqc.lib.types import (
ExternalFlag,
CallGraph,
MaterializedGraph,
PandasLike,
- FreqString,
)
-from saqc.lib.tools import toSequence
logger = logging.getLogger("SaQC")
@@ -301,6 +286,7 @@ class SaQC(FuncModules):
**{"nodata": self._nodata, "flag": self._translator(flag), **fkwargs},
)
+ # expand regular expressions
fields = self._data.columns.str.match(field) if regex else toSequence(field)
for field in fields:
target = target if target is not None else field
diff --git a/saqc/core/lib.py b/saqc/core/lib.py
index 705f56e19..2e6b19004 100644
--- a/saqc/core/lib.py
+++ b/saqc/core/lib.py
@@ -17,7 +17,6 @@ class ColumnSelector:
return f"{self.__class__.__name__}({self.field})"
-# TODO: this seems obsolete
@dataclass
class APIController:
def errorMessage(self):
--
GitLab