rm scipy-stack dependencies

Golden_Repo/c/cirq/Cirq-1.0.0-gcccoremkl-11.3.0-2022.1.0.eb

@@ -13,7 +13,8 @@ toolchainopts = {'pic': True}
 
 dependencies = [
     ('Python', '3.10.4'),
-    ('SciPy-Stack', '2022a'),
+    #('SciPy-Stack', '2022a'),
+    ('SciPy-bundle', '2022.05'),
     ('protobuf-python', '3.19.4'),
     ('networkx', '2.8.4'),
     ('tqdm', '4.64.0'),
@@ -28,15 +29,6 @@ exts_default_options = {
     'sanity_pip_check': True,
 }
 
-# This easyconfig cirq=1.0.0 works with Stage 2023's protobuf==3.19.4, but requires
-# different  versions of the following packages than the ones provided by:
-# 1) TensorFlow:
-# different: google-auth==2.16.0, grpcio==1.51.1, cachetools=='5.2.1'
-# same: pyasn1-modules=='0.2.8', rsa==4.9
-# 2) tensorboard:
-# different: google-auth==2.11.1, grpcio==1.49.1, cachetools=='5.2.0'
-# same: pyasn1-modules=='0.2.8', rsa==4.9
-
 
 exts_list = [
     ('pyasn1-modules', '0.2.8', {
@@ -122,4 +114,19 @@ exts_list = [
     }),
 ]
 
+
+# This easyconfig cirq=1.0.0 works with Stage 2023's protobuf==3.19.4, but requires
+# different  versions of the following packages than the ones provided by:
+# 1) TensorFlow:
+# different: google-auth==2.16.0, grpcio==1.51.1, cachetools=='5.2.1'
+# same: pyasn1-modules=='0.2.8', rsa==4.9
+# 2) tensorboard:
+# different: google-auth==2.11.1, grpcio==1.49.1, cachetools=='5.2.0'
+# same: pyasn1-modules=='0.2.8', rsa==4.9
+
+# Therefore we make Cirq conflict with TensorFLow or tensorboard if they are loaded simultaneously
+modluafooter = """
+conflict("TensorFlow", "tensorboard")
+"""
+
 moduleclass = 'quantum'

Golden_Repo/p/PyQuil/PyQuil-3.3.3-gcccoremkl-11.3.0-2022.1.0.eb

@@ -11,7 +11,9 @@ toolchainopts = {'pic': True}
 
 dependencies = [
     ('Python', '3.10.4'),
-    ('SciPy-Stack', '2022a'),
+    #('SciPy-Stack', '2022a'),
+    ('SciPy-bundle', '2022.05'),
+    ('IPython', '8.5.0'),
     ('networkx', '2.8.4'),
 
 ]