Merge branch 'main' into ubuntu_26.04

Author: tvami

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
       -
         name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ${{ env.REGISTRY_IMAGE }}
           tags: |
@@ -48,20 +48,20 @@ jobs:
             type=sha,format=short
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       -
         name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       -
         name: Build and push by digest
         id: build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           platforms: linux/${{ matrix.platform }}
@@ -102,11 +102,11 @@ jobs:
           merge-multiple: true
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       -
         name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ${{ env.REGISTRY_IMAGE }}
           tags: |
@@ -116,7 +116,7 @@ jobs:
             type=sha,format=short
       -
         name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -158,7 +158,7 @@ jobs:
       uses: actions/checkout@v6
     -
       name: Install just
-      uses: extractions/setup-just@v3
+      uses: extractions/setup-just@v4
       with:
         just-version: 1.26.0
     - 

.github/workflows/mdbook.yml

@@ -38,7 +38,7 @@ jobs:
         run: ./.github/install-mdbook
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@v6
       - name: Build with mdBook
         run: mdbook build
         working-directory: docs
@@ -54,7 +54,7 @@ jobs:
             --root-dir "${{ github.workspace }}/docs/book"
             ./docs/book
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v4
+        uses: actions/upload-pages-artifact@v5
         with:
           path: ./docs/book
 
@@ -68,4 +68,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5

Dockerfile

@@ -23,6 +23,7 @@ RUN install-ubuntu-packages \
     cmake \
     gcc g++ gfortran \
     gcc-13 g++-13 \
+    libcurl4-openssl-dev \
     locales \
     make \
     parallel \

ci/ldmx-sw-to-test.json

@@ -11,6 +11,7 @@
     "v4.4.7",
     "v4.4.14",
     "v4.5.11",
-    "v4.6.1"
+    "v4.6.5",
+    "v4.7.3"
   ]
 }

docs/src/python-packages.md

@@ -11,6 +11,18 @@ Instead, it is recommended for you to craft your own environment which is lighte
 it easier to reproduce and move around clusters) and more nimble (allowing you to upgrade
 packages if you want to).
 
+There are many programs satisfying this goal of managing a Python environment that
+can exist on your system without needing to run a container image. These can be
+faster than launching a container image but may not give you access to as fixed
+of an environment since many of the tools rely on system-installed Python.
+One tool that I (Tom) would suggest is [uv](https://docs.astral.sh/uv/).
+It handles the Python version as well as the versions of the packages you are using.
+You can "lock" these into a `uv.lock` file (committed to your analysis repository),
+so that you identical Python environments when switching between machines (or
+collaborating with other people).
+
+Below, I've outlined how to do a similar procedure using `denv` instead of `uv`
+since I'm assuming you've already installed `denv` for use with ldmx-sw.
 ```
 cd my-analysis
 denv init python:3.12 # choose python version

docs/src/ubuntu-packages.md

@@ -36,6 +36,7 @@ awk -f docs/src/get-ubuntu-packages.awk Dockerfile
 Package | Reason
 ---|---
 binutils | Adding PPA and linking libraries
+ccache | Improve compilation of ldmx-sw 
 cmake | Configuration of build system
 gcc | GNU C Compiler
 g++ | GNU C++ Compiler
@@ -51,6 +52,7 @@ python3-tk | matplotlib requires python-tk for some plotting
 rsync | necessary to build Pythia8 
 fonts-freefont-ttf | fonts for plots with ROOT
 libafterimage-dev | ROOT GUI needs these for common shapes
+libcurl4-openssl-dev | Used curl for accessing Conditions within ldmx-sw
 libfftw3-dev | Discrete fourier transform in ROOT
 libfreetype6-dev | fonts for plots with ROOT
 libftgl-dev | Rendering fonts in OpenGL