Merge branch 'master' into 'wdconinc-master-patch-02750'

# Conflicts:
#   .gitlab-ci.yml
#   spack.yaml

.gitlab-ci.yml

@@ -11,7 +11,7 @@ variables:
   ## Spack github version, e.g. v0.18.1 or commit hash
   SPACK_VERSION: "v0.19.0"
   ## Space-separated list of spack cherry-picks
-  SPACK_CHERRYPICKS: "b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e 99056e03bd3e903b222e300636ec484d85d4b3fb f3f8b31be54280c6ef0b5f95ab85604aba3dff30 0ea81affd18820933640279bbc687038b3296a4e dceb4c9d655d0529e112b8929558be60973b39f7 f2b0c1deab87da3b5aa4c1f2ef4d6af06fa4e32d"
+  SPACK_CHERRYPICKS: "b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e 99056e03bd3e903b222e300636ec484d85d4b3fb f3f8b31be54280c6ef0b5f95ab85604aba3dff30 0ea81affd18820933640279bbc687038b3296a4e dceb4c9d655d0529e112b8929558be60973b39f7 f2b0c1deab87da3b5aa4c1f2ef4d6af06fa4e32d 2f057d729da61e8c12828df44377f0a93fed820f 39a1f1462b0abf12dfaccd33f84142c852c4b56e 4b12d015e1c316b4837e02ae37e2c69a8a647180 7f1467e795b1cab8b4855e019910c509896ea0e1 62da76cb5dca4d52c43bee06230cca6a5882f05d cc2ae9f270befa554ba8b09c68e89bb8248ea650 ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228"
   ## Ref: https://github.com/spack/spack/commit/[hash]
   ## [hash]: [description]
   ## b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e: geant4: version bumps for Geant4 11.1.0
@@ -20,6 +20,13 @@ variables:
   ## 0ea81affd18820933640279bbc687038b3296a4e: py-torch: fix build with gcc@12:
   ## dceb4c9d655d0529e112b8929558be60973b39f7: Update PyTorch ecosystem
   ## f2b0c1deab87da3b5aa4c1f2ef4d6af06fa4e32d: py-minkowskiengine: new package (sparse tensor autodiff by Nvidia)
+  ## 2f057d729da61e8c12828df44377f0a93fed820f: py-scipy: add v1.9
+  ## 39a1f1462b0abf12dfaccd33f84142c852c4b56e: SIP build system: fix "python not defined in builder"
+  ## 4b12d015e1c316b4837e02ae37e2c69a8a647180: py-jinja2-cli: new package
+  ## 7f1467e795b1cab8b4855e019910c509896ea0e1: dd4hep: new version 1.24, depends_on podio@0.16:
+  ## 62da76cb5dca4d52c43bee06230cca6a5882f05d: directives: depends_on should not admit anonymous specs
+  ## cc2ae9f270befa554ba8b09c68e89bb8248ea650: Add a "maintainer" directive
+  ## ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228: Support packages for using scitokens on OSG
 
   ## EIC spack organization and repository, e.g. eic/eic-spack
   EICSPACK_ORGREPO: "eic/eic-spack"

containers/debian/base.Dockerfile

@@ -44,6 +44,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked             \
         locales                                                         \
         lua-posix                                                       \
         make                                                            \
+        moreutils                                                       \
         nano                                                            \
         openssh-client                                                  \
         parallel                                                        \

containers/jug/dev.Dockerfile

@@ -164,7 +164,7 @@ RUN cd /opt/spack-environment                                           \
     | xargs --no-run-if-empty                                           \
       spack buildcache create --allow-root --only package --unsigned    \
                               --mirror-name eic-spack                   \
-                              --rebuild-index                           \
+ && spack buildcache update-index --mirror-url eic-spack                \
  && spack mirror rm --scope site eic-spack                              \
     ; fi                                                                \
  && spack mirror list

containers/jug/requirements.txt

-awkward
-boto3
-ipython
-jinja2
-jinja2-cli
-jupyter
-jupyterlab
-lmfit
-lxml
-matplotlib
-pandas
-pycairo
 pyunfold
-pyyaml
-scipy
-seaborn
 stashcp
-uproot
-yapf
-mplhep

spack.yaml

@@ -12,7 +12,7 @@ spack:
     - cppcoro@git.10bbcdbf2be3ad3aa56febcf4c7662d771460a99
     - dawn@3_91a
     - dawncut@1_54a
-    - dd4hep@1.23 +ddg4 +ddcad +hepmc3 +lcio
+    - dd4hep@1.24 +ddg4 +ddcad -frames +hepmc3 +lcio
     - edm4eic@1.2.2 cxxstd=17
     - edm4hep@0.7 cxxstd=17
     - eic-smear@1.1.10
@@ -33,17 +33,36 @@ spack:
     - nlohmann-json@3.11.2
     - npsim@1.1.0 +geocad +http
     - opencascade@7.6.3
+    - osg-ca-certs@1.109.igtf.1.117
     - pkg-config@0.29.2
-    - podio@0.15
+    - podio@0.16
     - prmon@3.0.2 +plot
     - pythia8@8.306 +fastjet
     - python@3.10.8
+    - py-awkward@1.9.0
     - py-boto3@1.18.12
+    - py-ipython@8.5.0
+    - py-jinja2@3.1.2
+    - py-jinja2-cli@0.8.2
+    - py-jupyter@1.0.0
+    - py-jupyterlab@3.2.9
+    - py-lmfit@1.0.2
+    - py-lxml@4.9.1
+    - py-matplotlib@3.6.2
+    - py-mplhep@0.3.26
+    - py-htgettoken@1.16-33-g3788bb4
     - py-minkowskiengine@git.master
     - py-numpy@1.23.4
+    - py-pandas@1.5.1
     - py-pip@22.2.2
+    - py-pycairo@1.20.0
+    - py-pyyaml@6.0
+    - py-scipy@1.9.3
+    - py-seaborn@0.12.0
     - py-toml@0.10.2
     - py-torch@1.13.1 -gloo cflags="-Wno-error=maybe-uninitialized -Wno-error=uninitialized -Wno-error=restrict" cxxflags="-Wno-error=maybe-uninitialized -Wno-error=uninitialized -Wno-error=restrict" # https://github.com/pytorch/FBGEMM/issues/1094
+    - py-uproot@4.3.5
+    - py-yapf@0.30.0
     - qt@5.15.5 +opengl
     - root@6.26.06 cxxstd=17 
           +fftw +fortran +gdml +http -ipo +mlp +pythia8