Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b998dac
Update brian, nrn, nest, pynn
pgleeson Jun 13, 2025
c748e36
Back to pynn 0.11.0 for now...
pgleeson Jun 16, 2025
81ecb25
Test on macos-15
pgleeson Jul 29, 2025
a2b5823
To v0.3.11
pgleeson Aug 4, 2025
9f4abed
Merge branch 'development' into test_pynn012
pgleeson Aug 4, 2025
6717c83
Merge pull request #141 from OpenSourceBrain/test_pynn012
pgleeson Aug 5, 2025
17cd6ca
Fix YAML syntax for Python version exclusion
pgleeson Sep 15, 2025
19710db
Merge branch 'development' into test_jnml
pgleeson Oct 10, 2025
5de8709
Merge branch 'master' into development
pgleeson Nov 25, 2025
a7a0c2a
Merge branch 'master' into test_jnml
pgleeson Jan 6, 2026
41739e7
Test pinning numpy < 2.4
pgleeson Jan 6, 2026
e0c72ba
Test macos-14 as latest is 15
pgleeson Jan 6, 2026
4d7c586
Correct exclusion
pgleeson Jan 6, 2026
35a37da
More exclusions
pgleeson Jan 6, 2026
4a87941
Merge pull request #151 from OpenSourceBrain/test_jnml
pgleeson Jan 6, 2026
5980ed4
Remove pin on numpy; quantities issue solved...
pgleeson Jan 16, 2026
ea7d17e
Update default Brian2 version to 2.10.1 - test if it works with numpy…
pgleeson Jan 16, 2026
e782f49
Update Python version to 3.12 in CI workflow
pgleeson Feb 2, 2026
f840409
Merge branch 'master' into development
pgleeson Mar 20, 2026
a3985e3
Merge branch 'development' into test_jnml
pgleeson Mar 20, 2026
260ceea
Back to py3.11 for now
pgleeson Mar 20, 2026
9207aec
Back to py3.12 for brian, setuptools install for eden...
pgleeson Mar 20, 2026
84aa942
Test fix for eden
pgleeson Mar 20, 2026
7f4b719
test moose v4.1.4
pgleeson Mar 20, 2026
51eb856
Add install of pint for moose
pgleeson Mar 20, 2026
f3c3705
Temp disable moose test...
pgleeson Mar 20, 2026
3b4d774
Merge pull request #152 from OpenSourceBrain/test_jnml
pgleeson Mar 20, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.11" ]
python-version: [ "3.12" ]
engine:
- Arbor
- "Brian2:2.9.0"
Expand Down Expand Up @@ -49,14 +49,14 @@ jobs:
- pyNeuroML
- pyNeuroML_validate_sbml
- pyNEURON_XPP_LEMS
- jNeuroML_Moose
- MOOSE:3.1.5
- XPP
# - jNeuroML_Moose # not yet working on py3.12

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -67,9 +67,13 @@ jobs:
#sudo apt install octave
sudo apt-get install -y subversion # for neuroConstruct full install...

pip install setuptools==80 # needed for eden on Python 3.12...

- name: Install numpy < 2 if necessary...
run: |

if [[ ${{ matrix.engine }} == *"MOOSE"* ]] || [[ ${{ matrix.engine }} == *"Moose"* ]]; then pip install "numpy<2" ; fi ;

pip list

- name: Run OMV tests on engine ${{ matrix.engine }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ci_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
runs-on: [ubuntu-latest, macos-latest ]
runs-on: [ubuntu-latest, macos-14, macos-latest ]
exclude:
- runs-on: macos-14
python-version: "3.9"
- runs-on: macos-latest
python-version: "3.9"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.x"
- name: Install pypa/build
Expand Down
2 changes: 1 addition & 1 deletion omv/engines/getbrian2.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

def install_brian2(version):
if not version:
version = "2.7.1"
version = "2.10.1"
try:
pip_install("brian2", version)
import brian2
Expand Down
2 changes: 2 additions & 0 deletions omv/engines/getmoose.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
def install_moose(version):
if not version:
version = "4.0.0.dev20240411"
version = "4.1.4" # temp test this, it is the latest on pypi...
try:
pip_install("pymoose", version)
pip_install("pint")
import moose

m = "Successfully installed MOOSE..."
Expand Down
2 changes: 1 addition & 1 deletion omv/engines/getnest.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

def install_nest(version):
if not version:
version = "3.5"
version = "3.7"

inform("Installing NEST", indent=2, verbosity=1)
nestpath = os.path.join(os.environ["HOME"], "nest")
Expand Down
2 changes: 1 addition & 1 deletion omv/engines/getnrn.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
def install_neuron(version):
if not version:
if sys.version_info.major == 3:
version = "8.2.7" # for pynn 0.11.0
version = "8.2.7"
else:
version = "7.6"

Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = OSBModelValidation
version = 0.3.10
version = 0.3.11
author = Boris Marin, Padraig Gleeson
author_email = borismarin@gmail.com
url = https://github.com/OpenSourceBrain/osb-model-validation
Expand Down
2 changes: 1 addition & 1 deletion utilities/tests/.test.exIzh.jnml.omt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ experiments:
scaling: [1000, 1000]
spike detection:
method: threshold
tolerance: 0.000051
tolerance: 5.0862371508887715e-05
2 changes: 1 addition & 1 deletion utilities/tests/.test.exIzh.jnmleden.omt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ experiments:
scaling: [1000, 1000]
spike detection:
method: threshold
tolerance: 0.00014888369126089628
tolerance: 0.00014884116521364865