From 76d208cd1c1f646b406be93e3390a5a737d24707 Mon Sep 17 00:00:00 2001
From: Falco Weichselbaum <f.weichselbaum@fz-juelich.de>
Date: Thu, 21 Oct 2021 20:03:28 +0200
Subject: [PATCH] modules in requirements.txt and mlt_modules_* checked and
 updated with Python 3.8.5 versions

---
 HPC_setup/mlt_modules_hdfml.sh  |  8 ++------
 HPC_setup/mlt_modules_juwels.sh |  4 ++--
 requirements.txt                | 13 ++++++-------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/HPC_setup/mlt_modules_hdfml.sh b/HPC_setup/mlt_modules_hdfml.sh
index e8458371..57e1afc1 100644
--- a/HPC_setup/mlt_modules_hdfml.sh
+++ b/HPC_setup/mlt_modules_hdfml.sh
@@ -11,14 +11,10 @@ module use $OTHERSTAGES
 ml Stages/2020
 ml GCCcore/.9.3.0
 
-ml Jupyter/2020.3.0-Python-3.8.5
+ml Jupyter/2020.2.6-Python-3.8.5
 ml Python/3.8.5
 ml TensorFlow/2.3.1-Python-3.8.5
 ml SciPy-Stack/2020-Python-3.8.5
 ml dask/2.22.0-Python-3.8.5
 ml GEOS/3.8.1-Python-3.8.5
-ml Graphviz/2.44.1
-
-
-
-
+ml Graphviz/2.44.1
\ No newline at end of file
diff --git a/HPC_setup/mlt_modules_juwels.sh b/HPC_setup/mlt_modules_juwels.sh
index 5f131b61..4f0f366f 100755
--- a/HPC_setup/mlt_modules_juwels.sh
+++ b/HPC_setup/mlt_modules_juwels.sh
@@ -11,10 +11,10 @@ module use $OTHERSTAGES
 ml Stages/2020
 ml GCCcore/.9.3.0
 
-ml Jupyter/2020.3.0-Python-3.8.5
+ml Jupyter/2020.2.6-Python-3.8.5
 ml Python/3.8.5
 ml TensorFlow/2.3.1-Python-3.8.5
 ml SciPy-Stack/2020-Python-3.8.5
 ml dask/2.22.0-Python-3.8.5
 ml GEOS/3.8.1-Python-3.8.5
-ml Graphviz/2.44.1
+ml Graphviz/2.44.1
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 68e37c02..26fe9743 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,17 +5,18 @@ astropy==4.1
 attrs==20.3.0
 bottleneck==1.3.2
 cached-property==1.5.2
+Cartopy==0.18.0
 certifi==2020.12.5
 cftime==1.4.1
 chardet==4.0.0
 coverage==5.4
 cycler==0.10.0
-dask==2021.2.0
+dask==2.22.0
 dill==0.3.3
 fsspec==0.8.5
 gast==0.3.3
 grpcio==1.35.0
-h5py==2.10.0
+h5py==3.1.0
 idna==2.10
 importlib-metadata==3.4.0
 iniconfig==1.1.1
@@ -49,11 +50,13 @@ python-dateutil==2.8.1
 pytz==2021.1
 PyYAML==5.4.1
 requests==2.25.1
-scipy==1.4.1
+scipy==1.5.2
 seaborn==0.11.1
+--no-binary shapely Shapely==1.7.0
 six==1.15.0
 statsmodels==0.12.2
 tabulate==0.8.8
+tensorflow==2.5.0
 termcolor==1.1.0
 toml==0.10.2
 toolz==0.11.1
@@ -63,7 +66,3 @@ Werkzeug==1.0.1
 wget==3.2
 xarray==0.16.2
 zipp==3.4.0
-
---no-binary shapely Shapely==1.7.0
-# Cartopy==0.18.0
-tensorflow==2.3.1
\ No newline at end of file
-- 
GitLab