Merge branch 'trunk-minor' into trunk-major

Author: joaander

.github/workflows/build_and_test.yaml

@@ -120,7 +120,7 @@ jobs:
         apt-get update
         apt-get install git --yes
     - name: Checkout
-      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         path: code
         submodules: true
@@ -211,7 +211,7 @@ jobs:
         apt-get update
         apt-get install git --yes
     - name: Checkout
-      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         path: code
 

.github/workflows/release.yaml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         fetch-depth: 0
         submodules: true

.github/workflows/style.yaml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
     - name: Checkout
-      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: prek
       uses: glotzerlab/workflows/prek@894d9678188a02b06560fdeb2b9ba98d016cd371 # 0.10.0
 

hoomd/hpmc/IntegratorHPMCMonoGPU.cu

@@ -1,6 +1,8 @@
 // Copyright (c) 2009-2025 The Regents of the University of Michigan.
 // Part of HOOMD-blue, released under the BSD 3-Clause License.
 
+#include <cassert>
+
 #include "IntegratorHPMCMonoGPUTypes.cuh"
 
 namespace hoomd

hoomd/hpmc/IntegratorHPMCMonoGPUMoves.cuh

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <cassert>
+
 #include "hoomd/BoxDim.h"
 #include "hoomd/HOOMDMath.h"
 #include "hoomd/Index1D.h"

hoomd/md/EvaluatorPairFrictionLJVariants.h

@@ -120,4 +120,8 @@ class EvaluatorPairFrictionLJCoulombNewton
     };
     } // namespace md
     } // namespace hoomd
+
+#undef DEVICE
+#undef HOSTDEVICE
+
 #endif // __PAIR_EVALUATOR_FRICTIONLJVARIANTS_H__

pixi.lock

@@ -42,7 +42,7 @@
 if os.getenv("READTHEDOCS"):
     extensions.append("sphinx_copybutton")
     extensions.append("notfound.extension")
-    # extensions.append("sphinxcontrib.googleanalytics")
+    extensions.append("sphinxcontrib.googleanalytics")
     googleanalytics_id = "G-ZR0DNZD21E"
 
     katex_prerender = True

sphinx-doc/conf.py

@@ -4,7 +4,7 @@ accessible-pygments==0.0.5
     # via furo
 alabaster==1.0.0
     # via sphinx
-asttokens==3.0.0
+asttokens==3.0.1
     # via stack-data
 attrs==25.4.0
     # via
@@ -86,7 +86,7 @@ nbformat==5.10.4
     #   nbsphinx
 nbsphinx==0.9.7
     # via -r sphinx-doc/requirements.in
-numpy==2.3.4
+numpy==2.3.5
     # via -r sphinx-doc/requirements.in
 packaging==25.0
     # via
@@ -130,7 +130,7 @@ referencing==0.37.0
     #   jsonschema-specifications
 requests==2.32.5
     # via sphinx
-rpds-py==0.28.0
+rpds-py==0.29.0
     # via
     #   jsonschema
     #   referencing