Fixing more python packages to get only one matplotlib

stacks/pinot-noir/packages_stack.yaml

@@ -126,6 +126,9 @@ packages:
   libffi:
     require: ['@3.4.6']
 
+  libpressio:
+    require: ['~qoz']
+
   libssh2:
     prefer: ['crypto=openssl']
 
@@ -218,27 +221,43 @@ packages:
 
   python:
     require:
-    - spec: '+ssl +tkinter +crypt +bz2 +pyexpat +libxml2 +ctypes +uuid ~sqlite3'
+    - '+ssl'
+    - '+tkinter'
+    - '+crypt'
+    - '+bz2'
+    - '+pyexpat'
+    - '+libxml2'
+    - '+ctypes'
+    - '+uuid'
+    - '+sqlite3'
     - spec: '+optimizations'
       when: '%gcc'
     prefer:
     - spec: '%gcc@13.2.0'
       when: '%gcc'
 
+  py-cppy:
+    require: ['@1.2.1']
+
   py-cython:
     require:
     - one_of: ['@0.29.36', '@3.0.8']
     prefer: ['@3.0.8']
 
+  py-python-dateutil:
+    require: ['@2.8.2']
+
   py-fenics-dolfinx:
     require: ['@0.8.0']
 
   py-horovod:
     require: ['frameworks=pytorch,keras,tensorflow', 'controllers=mpi', 'tensor_ops=nccl']
 
+  py-kiwisolver:
+    require: ['@1.4.5']
+
   py-matplotlib:
-    require:
-    - '@3.3.4'
+    require: ['@3.3.4']
 
   py-mpmath:
     require: ['@1.2.1']
@@ -249,6 +268,9 @@ packages:
   py-pandas:
     prefer: ['@2.2.1']
 
+  py-pillow:
+    prefer: ['@9.5.0', '+jpeg']
+
   py-pysam:
     prefer: ['@0.22.1']
 

stacks/pinot-noir/spack.yaml

@@ -201,7 +201,7 @@ spack:
 
     - gcc_python_codes:
         - blast-plus
-        - cistem  ^fftw~~mpi
+        - cistem  ^fftw ~~mpi
         - ctffind ^fftw ~~mpi
         - gatk
         - hisat2
@@ -214,7 +214,7 @@ spack:
         - spades
 
     - gcc_python_blas_codes:
-        - caffe +python ^hdf5~mpi
+        - caffe +python ^hdf5 ~mpi
         - gdb +tui +source-highlight +xz
         - openbabel ++python ^boost ~~mpi
         - polymake ^cddlib@0.94h