Skip to content

Commit

Permalink
Merge branch 'master' into update-aeif-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
jessica-mitchell committed Oct 28, 2024
2 parents 63dd101 + 6ee4dc9 commit d9f79b2
Show file tree
Hide file tree
Showing 91 changed files with 2,650 additions and 1,931 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ebrains-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
if: ${{ github.repository_owner == 'nest' }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hifis-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
if: ${{ github.repository_owner == 'nest' }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jsc-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
if: ${{ github.repository_owner == 'nest' }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand Down
60 changes: 30 additions & 30 deletions .github/workflows/nestbuildmatrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
CLANG_FORMAT_FILE: ".clang-format"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -37,7 +37,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -60,7 +60,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -71,7 +71,7 @@ jobs:
fetch-depth: 0

- name: "Set up Python 3.x"
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: "3.10"

Expand All @@ -87,7 +87,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -98,7 +98,7 @@ jobs:
fetch-depth: 0

- name: "Set up Python 3.x"
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: "3.10"

Expand All @@ -119,7 +119,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -130,7 +130,7 @@ jobs:
fetch-depth: 0

- name: "Set up Python 3.x"
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: "3.10"

Expand All @@ -146,7 +146,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -157,7 +157,7 @@ jobs:
fetch-depth: 0

- name: "Set up Python 3.x"
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: "3.10"

Expand All @@ -169,7 +169,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -187,7 +187,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -214,7 +214,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -225,7 +225,7 @@ jobs:
fetch-depth: 0

- name: "Set up Python 3.x"
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: "3.10"

Expand All @@ -241,7 +241,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -252,7 +252,7 @@ jobs:
fetch-depth: 0

- name: "Set up Python 3.x"
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: "3.10"

Expand Down Expand Up @@ -291,7 +291,7 @@ jobs:
# name: "build-${{ matrix.os }}-${{ matrix.cpp_compiler }}-${{ matrix.use }}"

# - name: "Set up Python 3.x"
# uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
# uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
# with:
# python-version: "3.10"

Expand All @@ -318,7 +318,7 @@ jobs:
# fetch-depth: 0

# - name: "Set up Python 3.x"
# uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
# uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
# with:
# python-version: "3.10"

Expand All @@ -334,7 +334,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -345,7 +345,7 @@ jobs:
fetch-depth: 0

- name: "Set up Python 3.x"
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: "3.10"

Expand Down Expand Up @@ -374,7 +374,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -393,7 +393,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -404,7 +404,7 @@ jobs:
fetch-depth: 0

- name: "Set up Python 3.x"
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: "3.10"

Expand All @@ -422,7 +422,7 @@ jobs:
needs: [pydocstyle, rstcheck, vale]
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -433,7 +433,7 @@ jobs:
fetch-depth: 0

- name: "Set up Python 3.x"
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
# Using 3.8 because Read the docs does not work with higher versions.
# See also: https://github.com/nest/nest-simulator/pull/2744
Expand Down Expand Up @@ -468,7 +468,7 @@ jobs:
needs: [pydocstyle, rstcheck, vale]
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand Down Expand Up @@ -531,7 +531,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -542,7 +542,7 @@ jobs:
fetch-depth: 0

- name: "Set up Python 3.x"
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: "3.10"

Expand Down Expand Up @@ -746,7 +746,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand All @@ -757,7 +757,7 @@ jobs:
fetch-depth: 0

- name: "Set up Python 3.x"
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.12

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit
disable-telemetry: true
Expand Down
1 change: 1 addition & 0 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ const-naming-style = snake_case
method-naming-style = PascalCase

max-line-length = 120
fail-under = 9.98
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.0-post0.dev0
3.8.0-post0.dev0
12 changes: 12 additions & 0 deletions cmake/ConfigureSummary.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,18 @@ function( NEST_PRINT_CONFIG_SUMMARY )
message( "" )
endif ()

if ( NOT HAVE_BOOST )
message( "" )
message( "ATTENTION!" )
message( "You are about to compile NEST without the Boost Library or" )
message( "your Boost Library is too old (before v1.70). This means" )
message( "that a few neuron models will not be available and that" )
message( "overall performance may be reduced." )
message( "" )
message( "--------------------------------------------------------------------------------" )
message( "" )
endif ()

message( "You can now build and install NEST with" )
message( " make" )
message( " make install" )
Expand Down
9 changes: 4 additions & 5 deletions cmake/ProcessOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,9 @@ function( NEST_PROCESS_WITH_GSL )
set( GSL_ROOT "${with-gsl}" )
endif ()

find_package( GSL )
find_package( GSL 1.11 )

# only allow GSL 1.11 and later
if ( GSL_FOUND AND ( "${GSL_VERSION}" VERSION_GREATER "1.11"
OR "${GSL_VERSION}" VERSION_EQUAL "1.11" ))
if ( GSL_FOUND )
set( HAVE_GSL ON PARENT_SCOPE )

# export found variables to parent scope
Expand Down Expand Up @@ -550,7 +548,8 @@ function( NEST_PROCESS_WITH_BOOST )
set(Boost_USE_RELEASE_LIBS ON) # only find release libs
# Needs Boost version >=1.62.0 to use Boost sorting, JUNIT logging
# Require Boost version >=1.69.0 due to change in Boost sort
find_package( Boost 1.69.0 )
# Require Boost version >=1.70.0 due to change in package finding
find_package( Boost 1.70 CONFIG )
if ( Boost_FOUND )
# export found variables to parent scope
set( HAVE_BOOST ON PARENT_SCOPE )
Expand Down
Loading

0 comments on commit d9f79b2

Please sign in to comment.