Merge branch 'py37support' into 'develop'

Py37support

See merge request !488

.gitlab-ci.yml

@@ -73,6 +73,19 @@ coverage:
       cobertura: coverage.xml
 
 
+# test saqc with python 3.7
+python37:
+  stage: test
+  image: python:3.7
+  script:
+    - pytest tests dios/test -Werror --junitxml=report.xml
+    - python -m saqc --config docs/resources/data/config.csv --data docs/resources/data/data.csv --outfile /tmp/test.csv
+  artifacts:
+    when: always
+    reports:
+      junit: report.xml
+
+
 # test saqc with python 3.8
 python38:
   stage: test
@@ -97,6 +110,7 @@ python39:
     reports:
       junit: report.xml
 
+
 # test saqc with python 3.10
 python310:
   stage: test
@@ -109,6 +123,7 @@ python310:
     reports:
       junit: report.xml
 
+
 doctest:
   stage: test
   script:
@@ -116,6 +131,7 @@ doctest:
     - pip install -r requirements.txt
     - make test
 
+
 # ===========================================================
 # Building stage
 # ===========================================================

requirements.txt

@@ -7,11 +7,10 @@ dtw==1.4.0
 hypothesis==6.46.11
 matplotlib==3.5.2
 numba==0.55.2
-numpy==1.22.4
+numpy==1.21.6
 outlier-utils==0.0.3
 pyarrow==8.0.0
-pandas==1.4.2
-scikit-learn==1.1.1
-scipy==1.8.1
+pandas==1.3.5
+scikit-learn==1.0.2
+scipy==1.7.3
 typing_extensions==4.2.0
-seaborn==0.11.2

saqc/lib/plotting.py

@@ -13,7 +13,6 @@ import matplotlib as mpl
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
-import seaborn
 from typing_extensions import Literal
 
 from saqc.core.flags import Flags
@@ -30,9 +29,23 @@ STATSDICT = {
 
 PLOT_KWARGS = {"alpha": 0.8, "linewidth": 1}
 FIG_KWARGS = {"figsize": (16, 9)}
+
+_seaborn_color_palette = [
+    (0.00784313725490196, 0.24313725490196078, 1.0),
+    (1.0, 0.48627450980392156, 0.0),
+    (0.10196078431372549, 0.788235294117647, 0.2196078431372549),
+    (0.9098039215686274, 0.0, 0.043137254901960784),
+    (0.5450980392156862, 0.16862745098039217, 0.8862745098039215),
+    (0.6235294117647059, 0.2823529411764706, 0.0),
+    (0.9450980392156862, 0.2980392156862745, 0.7568627450980392),
+    (0.6392156862745098, 0.6392156862745098, 0.6392156862745098),
+    (1.0, 0.7686274509803922, 0.0),
+    (0.0, 0.8431372549019608, 1.0),
+]
+
 SCATTER_KWARGS = {
     "marker": ["s", "D", "^", "o"],
-    "color": seaborn.color_palette("bright"),
+    "color": _seaborn_color_palette,
     "alpha": 0.7,
     "zorder": 10,
     "edgecolors": "black",

setup.py

@@ -28,7 +28,7 @@ setup(
     long_description_content_type="text/markdown",
     url="https://git.ufz.de/rdm-software/saqc",
     packages=find_packages(exclude=("tests", "docs")),
-    python_requires=">=3.8",
+    python_requires=">=3.7",
     install_requires=[
         "Click",
         "dtw",
@@ -41,7 +41,6 @@ setup(
         "scikit-learn",
         "scipy",
         "typing_extensions",
-        "seaborn",
     ],
     license_files=("LICENSE.md", "LICENSES/GPL-3.0-or-later.txt"),
     entry_points={

tests/lib/test_rolling.py

@@ -12,9 +12,13 @@ n = np.nan
 
 
 def test_rolling_existence_of_attrs():
-    # Rolling.validate is deprectaed, the wrapped method, however,
-    # is not. So, let's call the private method for now...
-    r = pd.DataFrame().rolling(0)._validate()
+    r = pd.DataFrame().rolling(0)
+    if int(pd.__version__.replace(".", "")) < 140:
+        r = r.validate()
+    else:
+        # after pandas 1.4 Rolling.validate() is deprecated,
+        # the wrapped method, however, is not. For now, we use this
+        r = r._validate()
     c = customRoller(pd.DataFrame(), 0, min_periods=0)
     expected = [attr for attr in dir(r) if not attr.startswith("_")]
     result = [attr for attr in dir(c) if not attr.startswith("_")]