#345 working on qt compilation

brainvisa · May 22, 2023 · 709c179 · 709c179
1 parent 90d1515
commit 709c179
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/conda/setup_conda b/conda/setup_conda
@@ -48,7 +48,7 @@ if [ ! -e "$casaconda/conda" ]; then
     $apptainer /casa/src/casa-distro/conda/setup_dev_conda
 fi
 
-$root_apptainer /casa/src/casa-distro/conda/setup_run_compiled
+#$root_apptainer /casa/src/casa-distro/conda/setup_run_compiled
 
 if [ ! -e "$casaconda/src" ]; then
     $apptainer git clone https://github.com/sapetnioc/brainvisa-submodules /casa/src

diff --git a/conda/setup_run_conda b/conda/setup_run_conda
@@ -70,7 +70,17 @@ build_dependencies=(
     draco
 #    eigen #? was libeigen3-dev
 
-    pyqt
+
+    # Commented-out packaes that needs pyqt package in order
+    # to avoid an upgrade of sip package. The sip command
+    # is only installed with sip package version 4.* but sip
+    # package depends on sip 6.*
+    # pyqt
+    # qtconsole #? was python3-qtconsole
+    pyqt5-sip
+    'sip=4'
+    qt-main
+    qtconsole-base
 )
 
 # Runtime dependencies of FSL
@@ -186,7 +196,6 @@ brainvisa_python_runtime_dependencies=(
     pyzmq
     ipython
     #! python3-jupyter-client
-    qtconsole #? was python3-qtconsole
     nbsphinx
     sphinx-gallery
 
@@ -198,7 +207,6 @@ brainvisa_python_runtime_dependencies=(
     scipy
     scikit-image #? was python3-skimage
 
-    pyqt
 
     # python3-sip
     # python3-pyqt5