From e89a20142f1842a479b3ff6b1704274976f9a4ae Mon Sep 17 00:00:00 2001
From: leufen1 <l.leufen@fz-juelich.de>
Date: Wed, 7 Oct 2020 10:49:09 +0200
Subject: [PATCH] restructured some packages in requirements

---
 mlair/__init__.py    | 2 +-
 requirements.txt     | 8 ++++----
 requirements_gpu.txt | 7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mlair/__init__.py b/mlair/__init__.py
index c0f6183f..0332c7b9 100644
--- a/mlair/__init__.py
+++ b/mlair/__init__.py
@@ -1,7 +1,7 @@
 __version_info__ = {
     'major': 0,
     'minor': 12,
-    'micro': 1,
+    'micro': 2,
 }
 
 from mlair.run_modules import RunEnvironment, ExperimentSetup, PreProcessing, ModelSetup, Training, PostProcessing
diff --git a/requirements.txt b/requirements.txt
index e2d8f5bc..9032c997 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,13 @@
+Cython==0.29.15
 absl-py==0.9.0
 astor==0.8.1
 atomicwrites==1.3.0
 attrs==19.3.0
-Cartopy==0.17.0
 certifi==2019.11.28
 chardet==3.0.4
 cloudpickle==1.3.0
 coverage==5.0.3
 cycler==0.10.0
-Cython==0.29.15
 dask==2.11.0
 fsspec==0.6.2
 gast==0.3.3
@@ -50,7 +49,6 @@ PyYAML==5.3
 requests==2.23.0
 scipy==1.4.1
 seaborn==0.10.0
---no-binary shapely Shapely==1.7.0
 six==1.11.0
 statsmodels==0.11.1
 tabulate
@@ -66,4 +64,6 @@ Werkzeug==1.0.0
 xarray==0.15.0
 zipp==3.1.0
 
-setuptools~=49.6.0
\ No newline at end of file
+setuptools~=49.6.0
+Cartopy==0.17.0
+--no-binary shapely Shapely==1.7.0
\ No newline at end of file
diff --git a/requirements_gpu.txt b/requirements_gpu.txt
index 38598ff6..fac479d5 100644
--- a/requirements_gpu.txt
+++ b/requirements_gpu.txt
@@ -1,14 +1,13 @@
+Cython==0.29.15
 absl-py==0.9.0
 astor==0.8.1
 atomicwrites==1.3.0
 attrs==19.3.0
-#Cartopy==0.17.0
 certifi==2019.11.28
 chardet==3.0.4
 cloudpickle==1.3.0
 coverage==5.0.3
 cycler==0.10.0
-Cython==0.29.15
 dask==2.11.0
 fsspec==0.6.2
 gast==0.3.3
@@ -50,7 +49,6 @@ PyYAML==5.3
 requests==2.23.0
 scipy==1.4.1
 seaborn==0.10.0
---no-binary shapely Shapely==1.7.0
 six==1.11.0
 statsmodels==0.11.1
 tabulate
@@ -65,3 +63,6 @@ wcwidth==0.1.8
 Werkzeug==1.0.0
 xarray==0.15.0
 zipp==3.1.0
+
+#Cartopy==0.17.0
+--no-binary shapely Shapely==1.7.0
\ No newline at end of file
-- 
GitLab