From 742cafda2fcea42f6d30745b328cc8e854976857 Mon Sep 17 00:00:00 2001
From: Stefan Schneider <stefan.schneider@upb.de>
Date: Wed, 6 Jan 2021 10:57:40 +0100
Subject: [PATCH 1/4] update dependencies

---
 setup.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index e3f53d5af..5ae53be54 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
     'common-utils',
     'cython',   # otherwise sklearn fails
     'sklearn',
-    'pandas',
+    'pandas==1.0.0',
     'tensorflow==1.14.0',
     'keras==2.2.5',
     'matplotlib',
@@ -19,10 +19,6 @@
     'nose2'
 ]
 
-dependency_links = [
-    'git+https://github.com/RealVNF/common-utils'
-]
-
 setup(
     name='coord-sim',
     version='2.0.0',
@@ -30,7 +26,6 @@
                 'scheduling/balancing traffic between them.',
     url='https://github.com/RealVNF/coord-sim',
     author='Stefan Schneider',
-    dependency_links=dependency_links,
     author_email='stefan.schneider@upb.de',
     package_dir={'': 'src'},
     packages=find_packages('src'),

From 36e7aae6744db4b97b0050ee4424cb41c44fe792 Mon Sep 17 00:00:00 2001
From: Stefan Schneider <stefan.schneider@upb.de>
Date: Wed, 6 Jan 2021 12:50:07 +0100
Subject: [PATCH 2/4] update dependencies

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 5ae53be54..46966e78d 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,8 @@
     'networkx==2.4',
     'geopy',
     'pyyaml>=5.1',
-    'numpy>=1.16.5',
+    'numpy>=1.16.5,<1.19',
+    'scipy<1.6'
     'common-utils',
     'cython',   # otherwise sklearn fails
     'sklearn',

From 1e2a3281b6ea8dbdd130c7806e30867f532d4aac Mon Sep 17 00:00:00 2001
From: Stefan Schneider <stefan.schneider@upb.de>
Date: Wed, 6 Jan 2021 13:00:12 +0100
Subject: [PATCH 3/4] update dependencies

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 46966e78d..bb2df9f67 100644
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,11 @@
 from setuptools import setup, find_packages
 requirements = [
+    'scipy<1.6',
     'simpy>=4',
     'networkx==2.4',
     'geopy',
     'pyyaml>=5.1',
     'numpy>=1.16.5,<1.19',
-    'scipy<1.6'
     'common-utils',
     'cython',   # otherwise sklearn fails
     'sklearn',

From d1c5f7171d039e12a523c5381c2102f409419d61 Mon Sep 17 00:00:00 2001
From: stefanbschneider <28340802+stefanbschneider@users.noreply.github.com>
Date: Sat, 21 May 2022 13:39:55 +0200
Subject: [PATCH 4/4] fix and upgrade dependencies

---
 README.md        |  2 +-
 requirements.txt |  2 +-
 setup.py         | 14 ++++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 9221c9f69..7c5bd3247 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Simulate flow-level, inter-node network coordination including scaling and place
 
 ## Setup
 
-Requires Python 3.6. Install with (ideally using [virtualenv](https://virtualenv.pypa.io/en/stable/)):
+Requires **Python 3.6** (newer versions do not support the required TF 1.14). Install with (ideally using [virtualenv](https://virtualenv.pypa.io/en/stable/)):
 
 ```bash
 pip install -r requirements.txt
diff --git a/requirements.txt b/requirements.txt
index c7aee540e..5bfbb60da 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
---editable git://github.com/RealVNF/common-utils#egg=common-utils
+--editable git+https://github.com/RealVNF/common-utils#egg=common-utils
 --editable .
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 091c9a32e..64b15f110 100644
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,14 @@
 from setuptools import setup, find_packages
 requirements = [
-    'scipy<1.6',
+    'scipy==1.5.4',
     'simpy>=4',
     'networkx==2.4',
     'geopy',
     'pyyaml>=5.1',
-    'numpy>=1.16.5,<1.19',
+    'numpy>=1.16.5,<=1.19.5',
     'common-utils',
-    'cython',   # otherwise sklearn fails
-    'sklearn',
-    'pandas==1.0.0',
+    'scikit-learn',
+    'pandas==1.1.5',
     'tensorflow==1.14.0',
     'keras==2.2.5',
     'matplotlib',
@@ -22,15 +21,14 @@
 
 setup(
     name='coord-sim',
-    version='2.1.0',
+    version='2.1.1',
     description='Simulate flow-level, inter-node network coordination including scaling and placement of services and '
                 'scheduling/balancing traffic between them.',
     url='https://github.com/RealVNF/coord-sim',
     author='Stefan Schneider',
-    author_email='stefan.schneider@upb.de',
     package_dir={'': 'src'},
     packages=find_packages('src'),
-    install_requires=requirements + test_requirements,
+    install_requires=requirements,
     tests_require=test_requirements,
     zip_safe=False,
     entry_points={