From 83ae193560c411a2a9ea67a4f45e5ef0d4c39c02 Mon Sep 17 00:00:00 2001
From: liadomide <lia_domide@yahoo.com>
Date: Wed, 8 Jun 2022 15:14:30 +0300
Subject: [PATCH] Prepare release 2.6 Remove typing as direct dependency of
 tvb-library

---
 tvb_contrib/setup.py                     |  2 +-
 tvb_documentation/RELEASE_NOTES          | 10 ++++++++++
 tvb_framework/setup.py                   |  2 +-
 tvb_framework/setup_rest_client.py       |  2 +-
 tvb_library/setup.py                     |  4 ++--
 tvb_library/tvb/basic/config/settings.py |  2 +-
 tvb_storage/setup.py                     |  2 +-
 7 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/tvb_contrib/setup.py b/tvb_contrib/setup.py
index 2b3df4108b..dbaac49e49 100644
--- a/tvb_contrib/setup.py
+++ b/tvb_contrib/setup.py
@@ -30,7 +30,7 @@
 import shutil
 import setuptools
 
-CONTRIB_VERSION = "2.5"
+CONTRIB_VERSION = "2.6"
 CONTRIB_DEPENDENCIES = ["tvb-library", "xarray", "scikit-learn"]
 TEAM = "Stuart Knock, Dionysios Perdikis, Paula Sanz Leon, Bogdan Valean, Marmaduke Woodman"
 
diff --git a/tvb_documentation/RELEASE_NOTES b/tvb_documentation/RELEASE_NOTES
index fc9ea3c1c6..b19b99fa30 100644
--- a/tvb_documentation/RELEASE_NOTES
+++ b/tvb_documentation/RELEASE_NOTES
@@ -1,3 +1,13 @@
+======================================================================================================================================
+ The Virtual Brain (TVB)
+ Version: 2.6 - build 17216
+ Release Date: 8 June 2022
+ Description: release on Pypi
+======================================================================================================================================
+    * Bug fixes
+    * simulator.plots updated
+    * rename scientific_library into tvb_library and framework_tvb into tvb_framework
+
 ======================================================================================================================================
  The Virtual Brain (TVB)
  Version: 2.5 - build 17095
diff --git a/tvb_framework/setup.py b/tvb_framework/setup.py
index cf0476da81..deb76dd130 100644
--- a/tvb_framework/setup.py
+++ b/tvb_framework/setup.py
@@ -40,7 +40,7 @@
 import shutil
 import setuptools
 
-VERSION = "2.5"
+VERSION = "2.6"
 
 TVB_TEAM = "Mihai Andrei, Lia Domide, Stuart Knock, Bogdan Neacsa, Paula Prodan, Paula Sansz Leon, Marmaduke Woodman"
 
diff --git a/tvb_framework/setup_rest_client.py b/tvb_framework/setup_rest_client.py
index dd8d294dc6..e65b67da12 100644
--- a/tvb_framework/setup_rest_client.py
+++ b/tvb_framework/setup_rest_client.py
@@ -40,7 +40,7 @@
 
 manifest_maker.template = 'MANIFEST_rest_client.in'
 
-VERSION = "2.5"
+VERSION = "2.6"
 
 TVB_TEAM = "Lia Domide, Paula Prodan, Bogdan Valean, Robert Vincze"
 
diff --git a/tvb_library/setup.py b/tvb_library/setup.py
index aee123daf4..a97b206dc4 100644
--- a/tvb_library/setup.py
+++ b/tvb_library/setup.py
@@ -39,12 +39,12 @@
 import shutil
 import setuptools
 
-LIBRARY_VERSION = "2.5"
+LIBRARY_VERSION = "2.6"
 
 LIBRARY_TEAM = "Marmaduke Woodman, Stuart Knock, Paula Sanz Leon, Viktor Jirsa"
 
 LIBRARY_REQUIRED_PACKAGES = ["mako>=1.1.4", "matplotlib", "networkx", "numba", "numexpr", "numpy", 
-                             "requests", "autopep8", "scipy", "six", "typing", "pylems", "lxml"]
+                             "requests", "autopep8", "scipy", "six", "pylems", "lxml"]
 
 LIBRARY_REQUIRED_EXTRA = ["h5py",  "pytest", "pytest-benchmark", "pytest-xdist", "tvb-gdist", "tvb-data"]
 
diff --git a/tvb_library/tvb/basic/config/settings.py b/tvb_library/tvb/basic/config/settings.py
index 2a188015df..61779c3d8f 100644
--- a/tvb_library/tvb/basic/config/settings.py
+++ b/tvb_library/tvb/basic/config/settings.py
@@ -49,7 +49,7 @@ class VersionSettings(object):
     SVN_GIT_MIGRATION_REVISION = 10000
 
     # Current release number
-    BASE_VERSION = "2.5"
+    BASE_VERSION = "2.6"
 
     # Current DB version. Create a new migration script from command line and copy its gid here
     DB_STRUCTURE_VERSION = '32d4bf9f8cab'
diff --git a/tvb_storage/setup.py b/tvb_storage/setup.py
index 678ee96eb0..40a8d182e4 100644
--- a/tvb_storage/setup.py
+++ b/tvb_storage/setup.py
@@ -38,7 +38,7 @@
 import shutil
 import setuptools
 
-STORAGE_VERSION = "2.5"
+STORAGE_VERSION = "2.6"
 
 STORAGE_TEAM = "Lia Domide, Paula Prodan, Bogdan Valean, Robert Vincze"