Merge branch 'main' into dependabot/pip/pytest-mock-3.2.0

Author: beat-buesser

Dockerfile

@@ -4,7 +4,7 @@ RUN pip3 install keras==2.3.1
 #FROM tensorflow/tensorflow:1.15.3-py3
 #RUN pip3 install keras==2.2.5
 
-RUN pip3 install numpy==1.18.1 scipy==1.4.1 matplotlib==3.2.1 scikit-learn==0.22.1 six==1.13.0 Pillow==6.2.2 
+RUN pip3 install numpy==1.18.1 scipy==1.4.1 matplotlib==3.2.1 scikit-learn==0.22.1 six==1.15.0 Pillow==6.2.2
 RUN pip3 install tqdm==4.45.0 statsmodels==0.11.0 pydub==0.24.1 resampy==0.2.2 ffmpeg-python==0.2.0 cma==3.0.3 mypy==0.770
 
 #TODO check if jupyter notebook works

requirements.txt

@@ -3,7 +3,7 @@ numpy==1.18.1
 scipy==1.4.1
 matplotlib==3.2.1
 scikit-learn==0.22.1
-six==1.13.0
+six==1.15.0
 Pillow==7.1.0
 tqdm==4.45.0
 statsmodels==0.11.0