From 0046d29d6c44c967a23337f614d27e9e3d7b70b7 2021-07-31 17:16:07
From: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Date: 2021-07-31 17:16:07
Subject: [PATCH] Switch to speasy

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

---

diff --git a/app/PySide2-bindings/plugins/Demo-virtual-product.py b/app/PySide2-bindings/plugins/Demo-virtual-product.py
index 9ce7553..3373571 100644
--- a/app/PySide2-bindings/plugins/Demo-virtual-product.py
+++ b/app/PySide2-bindings/plugins/Demo-virtual-product.py
@@ -1,11 +1,11 @@
 import traceback
 from SciQLopBindings import PyDataProvider, Product, VectorTimeSerie, ScalarTimeSerie, DataSeriesType
 import numpy as np
-from spwc.cache import _cache
-from spwc.common.datetime_range import DateTimeRange
+from speasy.cache import _cache
+from speasy.common.datetime_range import DateTimeRange
 from datetime import datetime, timedelta, timezone
-from spwc.common.variable import SpwcVariable
-from spwc.amda import AMDA
+from speasy.common.variable import SpeasyVariable
+from speasy.amda import AMDA
 
 amda = AMDA()
 
diff --git a/app/PySide2-bindings/plugins/SPWC-Amda.py b/app/PySide2-bindings/plugins/SPWC-Amda.py
index e6837d9..e6dd429 100644
--- a/app/PySide2-bindings/plugins/SPWC-Amda.py
+++ b/app/PySide2-bindings/plugins/SPWC-Amda.py
@@ -5,7 +5,7 @@ from SciQLopBindings import PyDataProvider, Product, VectorTimeSerie, ScalarTime
 import numpy as np
 import requests
 import copy
-from spwc.amda import AMDA
+from speasy.amda import AMDA
 
 amda = AMDA()
 
diff --git a/app/PySide2-bindings/plugins/TestPlugin.py b/app/PySide2-bindings/plugins/TestPlugin.py
index 2f77d8b..605b7bd 100644
--- a/app/PySide2-bindings/plugins/TestPlugin.py
+++ b/app/PySide2-bindings/plugins/TestPlugin.py
@@ -2,35 +2,35 @@ import traceback
 from SciQLopBindings import PyDataProvider, Product, VectorTimeSerie, ScalarTimeSerie, DataSeriesType
 import numpy as np
 import math
-from spwc.cache import _cache
-from spwc.common.datetime_range import DateTimeRange
+from speasy.cache import _cache
+from speasy.common.datetime_range import DateTimeRange
 from functools import partial
 from datetime import datetime, timedelta, timezone
-from spwc.common.variable import SpwcVariable
+from speasy.common.variable import SpeasyVariable
 
 
 def make_scalar(x):
     y = np.cos(x/10.)
-    return SpwcVariable(time=x, data=y)
+    return SpeasyVariable(time=x, data=y)
 
 def make_vector(x):
     v=np.ones((len(x),3))
     for i in range(3):
         v.transpose()[:][i] = np.cos(x/10. + float(i)) + (100. * np.cos(x/10000. + float(i)))
-    return SpwcVariable(time=x, data=v)
+    return SpeasyVariable(time=x, data=v)
 
 
 def make_multicomponent(x):
     v=np.ones((len(x),4))
     for i in range(4):
         v.transpose()[:][i] = float(i+1) * np.cos(x/10. + float(i))
-    return SpwcVariable(time=x, data=v)
+    return SpeasyVariable(time=x, data=v)
 
 def make_spectrogram(x):
     v=np.ones((len(x),32))
     for i in range(32):
         v.transpose()[:][i] = 100.*(2.+ float(i+1) * np.cos(x/1024. + float(i)))
-    return SpwcVariable(time=x, data=v)
+    return SpeasyVariable(time=x, data=v)
 
 
 def _get_data(p_type, start, stop):
diff --git a/build_cfg/linux/appImage.sh b/build_cfg/linux/appImage.sh
index cdb0843..ff60481 100644
--- a/build_cfg/linux/appImage.sh
+++ b/build_cfg/linux/appImage.sh
@@ -20,7 +20,7 @@ cp $HERE/AppRun $SCIQLOP_APPDIR/
 chmod +x $SCIQLOP_APPDIR/AppRun
 # Tweak to find custom python from build dir
 sed "s|/usr|$SCIQLOP_APPDIR/usr|" -i $SCIQLOP_APPDIR/usr/lib/pkgconfig/python3.pc
-LD_PRELOAD=$SCIQLOP_APPDIR/usr/lib/libpython3.7m.so.1.0 PATH=$SCIQLOP_APPDIR/usr/bin/:/usr/bin/ LD_LIBRARY_PATH=AppDir/usr/lib/:AppDir/usr/lib/python3.7/ $SCIQLOP_APPDIR/usr/bin/python3 $SCIQLOP_APPDIR/usr/bin/pip3 install git+https://github.com/jeandet/spwc
+LD_PRELOAD=$SCIQLOP_APPDIR/usr/lib/libpython3.7m.so.1.0 PATH=$SCIQLOP_APPDIR/usr/bin/:/usr/bin/ LD_LIBRARY_PATH=AppDir/usr/lib/:AppDir/usr/lib/python3.7/ $SCIQLOP_APPDIR/usr/bin/python3 $SCIQLOP_APPDIR/usr/bin/pip3 install speasy
 LD_LIBRARY_PATH=$SCIQLOP_APPDIR/usr/lib/ PKG_CONFIG_PATH=$SCIQLOP_APPDIR/usr/lib/pkgconfig/:$PKG_CONFIG_PATH PATH=$SCIQLOP_APPDIR/usr/bin/:$PATH meson --prefix=/usr ..
 ninja
 DESTDIR=$SCIQLOP_APPDIR ninja install
diff --git a/build_cfg/mac/build.sh b/build_cfg/mac/build.sh
index 7ecec4a..07b7f99 100755
--- a/build_cfg/mac/build.sh
+++ b/build_cfg/mac/build.sh
@@ -10,6 +10,6 @@ ninja install
 ~/Library/Python/3.7/bin/virtualenv --always-copy /tmp/SciQLOP.app
 ~/Library/Python/3.7/bin/virtualenv --relocatable /tmp/SciQLOP.app
 source /tmp/SciQLOP.app/bin/activate
-/tmp/SciQLOP.app/bin/pip install git+https://github.com/jeandet/spwc
+/tmp/SciQLOP.app/bin/pip install speasy
 cp $HERE/SciQLOP_wrapper /tmp/SciQLOP.app/Contents/MacOS/
 chmod +x /tmp/SciQLOP.app/Contents/MacOS/SciQLOP_wrapper