Skip to content
Snippets Groups Projects
Commit 8901e1de authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Merge branch 'v3.0-stable' into 'master'

V3.0 stable

See merge request !64
parents 532062b6 e0aedd96
Branches
Tags
1 merge request!64V3.0 stable
...@@ -157,7 +157,7 @@ RUN cd /opt/spack-environment \ ...@@ -157,7 +157,7 @@ RUN cd /opt/spack-environment \
&& pip install --trusted-host pypi.org \ && pip install --trusted-host pypi.org \
--trusted-host files.pythonhosted.org \ --trusted-host files.pythonhosted.org \
--no-cache-dir \ --no-cache-dir \
ipython matplotlib scipy yapf pandas \ ipython matplotlib scipy yapf pandas pycairo pyyaml \
jupyter jupyterlab uproot pyunfold seaborn \ jupyter jupyterlab uproot pyunfold seaborn \
&& echo -n "" \ && echo -n "" \
&& echo "Executing cmake patch for dd4hep 16.1" \ && echo "Executing cmake patch for dd4hep 16.1" \
......
...@@ -9,9 +9,9 @@ spack: ...@@ -9,9 +9,9 @@ spack:
- clhep@2.4.4.0 cxxstd=17 - clhep@2.4.4.0 cxxstd=17
- eigen@3.3.9 - eigen@3.3.9
- python@3.7.8 - python@3.7.8
- py-pip - py-numpy@1.20.1
- py-numpy - py-pip@20.2
- py-pyyaml - pkg-config@0.29.2
- xrootd@5.1.0 cxxstd=17 +python - xrootd@5.1.0 cxxstd=17 +python
- root@6.22.08 cxxstd=17 - root@6.22.08 cxxstd=17
+fftw +fortran +gdml +http +mlp +pythia8 +fftw +fortran +gdml +http +mlp +pythia8
...@@ -20,7 +20,7 @@ spack: ...@@ -20,7 +20,7 @@ spack:
- pythia8@8303 - pythia8@8303
- hepmc3@3.2.2 +python +rootio - hepmc3@3.2.2 +python +rootio
- stow@2.3.1 - stow@2.3.1
- cairo+fc+ft+X+pdf+gobject - cairo@1.16.0 +fc+ft+X+pdf+gobject
- podio@0.13 - podio@0.13
- geant4@10.7.1 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl - geant4@10.7.1 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl
- dd4hep@1.16.1 +geant4 +assimp +hepmc3 +ipo - dd4hep@1.16.1 +geant4 +assimp +hepmc3 +ipo
...@@ -28,6 +28,6 @@ spack: ...@@ -28,6 +28,6 @@ spack:
- gaudi@34.0 - gaudi@34.0
- dawn@3_91a - dawn@3_91a
- dawncut@1_54a - dawncut@1_54a
- opencascade - opencascade@7.4.0p1
concretization: together concretization: together
view: /usr/local view: /usr/local
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment