Merge branch 'master' into whatsnew-3.8

nest · Jul 2, 2024 · 4abc994 · 4abc994
2 parents cce68cb + ccb3d4e
commit 4abc994
Show file tree

Hide file tree

Showing 23 changed files with 3,700 additions and 56 deletions.
diff --git a/.github/workflows/nestbuildmatrix.yml b/.github/workflows/nestbuildmatrix.yml
@@ -454,7 +454,7 @@ jobs:
           make docs |& tee sphinx-output.log
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: "sphinx-rtd output"
           path: |
@@ -500,7 +500,7 @@ jobs:
           make html |& tee sphinx-output.log
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           path: |
             build/sphinx-output.log
@@ -716,7 +716,7 @@ jobs:
           make VERBOSE=1 installcheck
 
       - name: "Upload install and test results"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         if: always()
         with:
           name: "build-logs-${{ matrix.os }}-${{ matrix.cpp_compiler }}-${{ matrix.use }}"
@@ -844,7 +844,7 @@ jobs:
           make VERBOSE=1 installcheck
 
       - name: "Upload install and test results"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         if: ${{ always() }}
         with:
           name: "${{ matrix.NEST_BUILD_TYPE }}-build-logs-${{ matrix.os }}-${{ matrix.cpp_compiler }}"

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -63,7 +63,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: SARIF file
           path: results.sarif

diff --git a/doc/htmldoc/examples/index.rst b/doc/htmldoc/examples/index.rst
@@ -153,6 +153,12 @@ PyNEST examples
 
            * :doc:`../auto_examples/CampbellSiegert`
 
+.. grid:: 1 1 2 3
+
+      .. grid-item-card:: Decision making in recurrent network (after Wang 2002)
+           :img-top: ../static/img/nest_logo-faded.png
+
+           * :doc:`../auto_examples/wang_decision_making`
 
 .. grid:: 1 1 2 3
 
@@ -351,6 +357,7 @@ PyNEST examples
    ../auto_examples/astrocytes/astrocyte_brunel
    ../auto_examples/EI_clustered_network/index
    ../auto_examples/eprop_plasticity/index
+   ../auto_examples/wang_decision_making
 
 .. toctree::
    :hidden:

diff --git a/doc/htmldoc/model_details/Brunel_Wang_2001_Model_Approximation.ipynb b/doc/htmldoc/model_details/Brunel_Wang_2001_Model_Approximation.ipynb
diff --git a/doc/htmldoc/templates/layout.html b/doc/htmldoc/templates/layout.html
@@ -36,7 +36,7 @@
         </div>
         <div class="grid_4 narrow" >
           <div id="attribution" style="color:#666;">
-            <a href="attribution-list.html">Attribution for images and icons</a>
+            <a href="{{ pathto('attribution-list.html', 1) }}">Attribution for images and icons</a>
           </div>
         </div>
       </div>