Merge tag 'v2.2.1'

.gitlab-ci.yml

@@ -16,7 +16,7 @@ stages:
   - deploy
 
 default:
-  image: python:3.8
+  image: python:3.10
   before_script:
     - pip install --upgrade pip
     - pip install -r requirements.txt

CHANGELOG.md

@@ -7,13 +7,23 @@ SPDX-License-Identifier: GPL-3.0-or-later
 # Changelog
 
 ## Unreleased
-[List of commits](https://git.ufz.de/rdm-software/saqc/-/compare/v2.2.0...develop)
+[List of commits](https://git.ufz.de/rdm-software/saqc/-/compare/v2.2.1...develop)
 ### Added
 ### Changed
 ### Removed
 ### Fixed
 
-## [2.2.0](https://git.ufz.de/rdm-software/saqc/-/tags/v2.0.1) - 2022-10-28
+## [2.2.1](https://git.ufz.de/rdm-software/saqc/-/tags/v2.2.1) - 2022-10-29
+[List of commits](https://git.ufz.de/rdm-software/saqc/-/compare/v2.2.0...v2.2.1)
+### Added
+- data label to `plot` legend
+### Changed
+- `dfilter` default value inference to respect the function default value of `plot`
+### Removed
+### Fixed
+- functions not handling `target` failed to overwrite existing variables
+
+## [2.2.0](https://git.ufz.de/rdm-software/saqc/-/tags/v2.2.0) - 2022-10-28
 [List of commits](https://git.ufz.de/rdm-software/saqc/-/compare/v2.1.0...v2.2.0)
 ### Added
 - translation of `dfilter`
@@ -36,7 +46,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 - fixed bug in function parameter checking
 - fixed bug one-off bug in `flagJumps`
 
-## [2.1.0](https://git.ufz.de/rdm-software/saqc/-/tags/v2.0.1) - 2022-06-14
+## [2.1.0](https://git.ufz.de/rdm-software/saqc/-/tags/v2.1.0) - 2022-06-14
 [List of commits](https://git.ufz.de/rdm-software/saqc/-/compare/v2.0.1...v2.1.0)
 ### Added
 - documentation of global keywords

saqc/core/register.py

@@ -104,14 +104,13 @@ def _getDfilter(
     """
     dfilter = kwargs.get("dfilter")
     if dfilter is None or isinstance(dfilter, OptionalNone):
-        # let's see, if the function has an default value
+        # let's see, if the function has a default value
         default = func_signature.parameters.get("dfilter")
-        if default:
+        if default is None or default.default == inspect.Signature.empty:
+            default = FILTER_ALL
+        else:
             default = default.default
-        if default == inspect.Signature.empty:
-            # function did not define a positional dfilter argument
-            default = None
-        dfilter = translation_scheme.DFILTER_DEFAULT or default
+        dfilter = max(translation_scheme.DFILTER_DEFAULT, default)
     else:
         # try to translate dfilter
         if dfilter not in {FILTER_ALL, FILTER_NONE, translation_scheme.DFILTER_DEFAULT}:
@@ -367,7 +366,7 @@ def register(
                 # initialize all target variables
                 for src, trg in zip(fields, targets):
                     if src != trg:
-                        out = out.copyField(field=src, target=trg)
+                        out = out.copyField(field=src, target=trg, overwrite=True)
 
             for src, trg in zip(fields, targets):
                 kwargs = {**kwargs, "field": src, "target": trg}

saqc/lib/plotting.py

@@ -191,7 +191,7 @@ def _plotVarWithFlags(
 ):
     scatter_kwargs = scatter_kwargs.copy()
     ax.set_title(datser.name)
-    ax.plot(datser, color="black", label=" ", **plot_kwargs)
+    ax.plot(datser, color="black", label="data", **plot_kwargs)
     ax.set(**ax_kwargs)
     shape_cycle = scatter_kwargs.get("marker", "o")
     shape_cycle = itertools.cycle(toSequence(shape_cycle))

saqc/version.py

@@ -4,4 +4,4 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-__version__ = "2.2.0"
+__version__ = "2.2.1"