TVB-3110: update for siibra 1.a19

the-virtual-brain · Nov 21, 2024 · ba55a13 · ba55a13
1 parent 57b6341
commit ba55a13
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/tvb_build/docker/requirements_group b/tvb_build/docker/requirements_group
@@ -1,4 +1,5 @@
 numpy<2
+siibra
 cryptography
 sqlalchemy
 pyAesCrypt
@@ -49,7 +50,6 @@ lxml
 pylems
 docutils
 Pillow
-siibra
 bctpy
 kubernetes
 watchdog

diff --git a/tvb_build/tvb_build/third_party_licenses/packages_accepted.xml b/tvb_build/tvb_build/third_party_licenses/packages_accepted.xml
@@ -1587,7 +1587,17 @@
     <dependency env="[win,mac,linux]" name="elasticsearch">
         <full-name value="elasticsearch"/>
         <project-home value="https://pypi.org/project/elasticsearch/"/>
-        <version value="[8.8.0,8.9.0,8.15.1,8.16.0,(8,16,0),(8, 16, 0)]"/>
+        <version value="[8.15.1,8.16.0]"/>
+        <usage value="dynamic linking"/>
+        <license value="LICENSE_elasticsearch.txt"/>
+        <license-type value="Apache_ 2"/>
+        <copyright-notice value="Copyright 2023 Elasticsearch B.V. Licensed under the Apache License, Version 2.0"/>
+        <description value="Python client for Elasticsearch"/>
+    </dependency>
+    <dependency env="[win,mac,linux]" name="elasticsearch-py">
+        <full-name value="elasticsearch-py"/>
+        <project-home value="https://pypi.org/project/elasticsearch/"/>
+        <version value="[8.15.1,8.16.0]"/>
         <usage value="dynamic linking"/>
         <license value="LICENSE_elasticsearch.txt"/>
         <license-type value="Apache_ 2"/>

diff --git a/tvb_framework/pyproject.toml b/tvb_framework/pyproject.toml
@@ -92,7 +92,7 @@ dependencies = [
     "requests-toolbelt>=0.10",
     "scikit-learn",
     "scipy",
-    "siibra==1.0a14",
+    "siibra",
     "simplejson",
     "six",
     "sqlalchemy",

diff --git a/tvb_framework/tvb/adapters/creators/siibra_base.py b/tvb_framework/tvb/adapters/creators/siibra_base.py
@@ -225,7 +225,7 @@ def get_regions_positions(regions):
 
     for r in regions:
         space = r.supported_spaces[0]  # choose first space that is available for that region
-        centroid = r.spatial_props(space=space).components[0].centroid
+        centroid = r.spatial_props(space=space)[0].centroid
         positions.append(centroid.coordinate)
 
     return positions