Skip to content

Commit 4abc994

Browse files
Merge branch 'master' into whatsnew-3.8
2 parents cce68cb + ccb3d4e commit 4abc994

23 files changed

+3700
-56
lines changed

.github/workflows/nestbuildmatrix.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ jobs:
454454
make docs |& tee sphinx-output.log
455455
456456
- name: Upload artifacts
457-
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
457+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
458458
with:
459459
name: "sphinx-rtd output"
460460
path: |
@@ -500,7 +500,7 @@ jobs:
500500
make html |& tee sphinx-output.log
501501
502502
- name: Upload artifacts
503-
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
503+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
504504
with:
505505
path: |
506506
build/sphinx-output.log
@@ -716,7 +716,7 @@ jobs:
716716
make VERBOSE=1 installcheck
717717
718718
- name: "Upload install and test results"
719-
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
719+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
720720
if: always()
721721
with:
722722
name: "build-logs-${{ matrix.os }}-${{ matrix.cpp_compiler }}-${{ matrix.use }}"
@@ -844,7 +844,7 @@ jobs:
844844
make VERBOSE=1 installcheck
845845
846846
- name: "Upload install and test results"
847-
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
847+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
848848
if: ${{ always() }}
849849
with:
850850
name: "${{ matrix.NEST_BUILD_TYPE }}-build-logs-${{ matrix.os }}-${{ matrix.cpp_compiler }}"

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6464
# format to the repository Actions tab.
6565
- name: "Upload artifact"
66-
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
66+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
6767
with:
6868
name: SARIF file
6969
path: results.sarif

doc/htmldoc/examples/index.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,12 @@ PyNEST examples
153153

154154
* :doc:`../auto_examples/CampbellSiegert`
155155

156+
.. grid:: 1 1 2 3
157+
158+
.. grid-item-card:: Decision making in recurrent network (after Wang 2002)
159+
:img-top: ../static/img/nest_logo-faded.png
160+
161+
* :doc:`../auto_examples/wang_decision_making`
156162

157163
.. grid:: 1 1 2 3
158164

@@ -351,6 +357,7 @@ PyNEST examples
351357
../auto_examples/astrocytes/astrocyte_brunel
352358
../auto_examples/EI_clustered_network/index
353359
../auto_examples/eprop_plasticity/index
360+
../auto_examples/wang_decision_making
354361

355362
.. toctree::
356363
:hidden:

doc/htmldoc/model_details/Brunel_Wang_2001_Model_Approximation.ipynb

Lines changed: 595 additions & 0 deletions
Large diffs are not rendered by default.

doc/htmldoc/templates/layout.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</div>
3737
<div class="grid_4 narrow" >
3838
<div id="attribution" style="color:#666;">
39-
<a href="attribution-list.html">Attribution for images and icons</a>
39+
<a href="{{ pathto('attribution-list.html', 1) }}">Attribution for images and icons</a>
4040
</div>
4141
</div>
4242
</div>

0 commit comments

Comments
 (0)