Merge pull request #7 from MuonColliderSoft/master

Fixed versions of a few dependencies
MuonColliderSoft · Jun 18, 2023 · fcac386 · fcac386
2 parents 8526367 + 13eb54d
commit fcac386
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/environments/mucoll-release/packages.yaml b/environments/mucoll-release/packages.yaml
@@ -104,11 +104,19 @@ packages:
   generalbrokenlines:
     require: '@2.2.1'
 
+  # Loose version requirements
+  gdb:
+    require: '@10:'
+  xrootd:
+    require: '@5:'
+
   # Just variants. No specific version requirements
   fftw:
     variants: ~mpi
   mesa:
     variants: ~llvm+glx+opengl swr=none
+  tauola:
+    variants: ~lhapdf
 
   all:
     target: [x86_64]

diff --git a/packages/mucoll-stack/package.py b/packages/mucoll-stack/package.py
@@ -31,8 +31,8 @@ class MucollStack(BundlePackage, Key4hepPackage):
     # should use `environments/mucoll-release/packages.yaml`
     version('2.8')
 
-    # this bundle package installs a custom setup script, so
-    # need to add the install phase 
+    # this bundle package installs a custom setup script,
+    # so need to add the install phase
     # (normally doesn't exist for a bundle package)
     phases = ['install']
 
@@ -113,19 +113,19 @@ class MucollStack(BundlePackage, Key4hepPackage):
         depends_on('onnx')
         depends_on('xgboost')
         # Python tools
-        depends_on('py-h5py', when='+devtools')
-        depends_on('py-ipython', when='+devtools')
-        depends_on('py-jupytext', when='+devtools')
-        depends_on('py-matplotlib', when='+devtools')
-        depends_on('py-onnxruntime', when='+devtools')
-        depends_on('py-onnx', when='+devtools')
-        depends_on('py-pandas', when='+devtools')
-        depends_on('py-particle', when='+devtools')
-        depends_on('py-pip', when='+devtools')
-        depends_on('py-scikit-learn', when='+devtools')
-        depends_on('py-scipy', when='+devtools')
-        depends_on('py-uproot', when='+devtools')
-        depends_on('py-xgboost', when='+devtools')
+        depends_on('py-h5py')
+        depends_on('py-ipython')
+        depends_on('py-jupytext')
+        depends_on('py-matplotlib')
+        depends_on('py-onnxruntime')
+        depends_on('py-onnx')
+        depends_on('py-pandas')
+        depends_on('py-particle')
+        depends_on('py-pip')
+        depends_on('py-scikit-learn')
+        depends_on('py-scipy')
+        depends_on('py-uproot')
+        depends_on('py-xgboost')
 
     ##################### conflicts #######################
     #######################################################