Skip to content

Commit fb499b1

Browse files
pgleesonpgleeson
authored
Merge pull request #7 from OpenSourceBrain/development
Restructure to use nml 1/2
2 parents 3f58215 + 4a4ee31 commit fb499b1

File tree

81 files changed

+1018
-23876
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1018
-23876
lines changed

‎.github/workflows/build-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
5151
- name: Test simple Moose file
5252
run: |
53-
cd NeuroML
53+
cd NeuroML2
5454
python -c "import moose; print(moose.__version__)"
5555
echo "Running simple file"
5656
python simple.py
@@ -61,7 +61,7 @@ jobs:
6161
6262
- name: Test OMV on Moose
6363
run: |
64-
cd NeuroML/test_files
64+
cd NeuroML2/test_files
6565
omv all --engine=jNeuroML_Moose
6666
6767

‎.github/workflows/ci_pip.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ jobs:
4040
4141
- name: Test simple Moose file
4242
run: |
43-
cd NeuroML
43+
cd NeuroML2
4444
python -c "import moose; print(moose.__version__)"
4545
echo "Running simple file"
4646
python simple.py
4747
4848
4949
- name: Test Moose files with NeuroML version 2
5050
run: |
51-
cd NeuroML
51+
cd NeuroML2
5252
python run_hhcell.py -nogui
5353
5454
- name: Final version info

‎.github/workflows/ci_pre_pip.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ jobs:
3939
4040
- name: Test simple Moose file
4141
run: |
42-
cd NeuroML
42+
cd NeuroML2
4343
python -c "import moose; print(moose.__version__)"
4444
echo "Running simple file"
4545
python simple.py
4646
4747
- name: Test Moose files with NeuroML version 2
4848
run: |
49-
cd NeuroML
49+
cd NeuroML2
5050
python run_hhcell.py -nogui
5151
5252
- name: Install OMV

‎.github/workflows/omv-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
python-version: [ 3.9 ]
18-
engine: [ jNeuroML, jNeuroML_NEURON, jNeuroML_validate, jNeuroML_Moose ]
18+
engine: [ jNeuroML, jNeuroML_NEURON, jNeuroML_validate, jNeuroML_Moose, jNeuroML_EDEN, jNeuroML_NetPyNE ]
1919

2020
steps:
2121
- uses: actions/checkout@v4

‎.gitignore‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,20 @@
22
/tests/python/tests.log
33
/tests.log
44
tests.log
5-
/NeuroML/*.dat
5+
/NeuroML2/*.dat
66
*_moose.py
77
*_nrn.py
8-
/NeuroML/test_files/NML2_SingleCompHHCell.nml__flattened.xml
9-
/NeuroML/test_files/*.dat
10-
/NeuroML/test_files/*.hoc
11-
/NeuroML/test_files/*.mod
8+
/NeuroML2/test_files/NML2_SingleCompHHCell.nml__flattened.xml
9+
/NeuroML2/test_files/*.dat
10+
/NeuroML2/test_files/*.hoc
11+
/NeuroML2/test_files/*.mod
1212
x86_64
13+
arm64
14+
__pycache__
15+
*_code.gen.*
16+
/NeuroML2/GranuleCell/*.dat
17+
/NeuroML2/GranuleCell/*.mod
18+
/NeuroML2/GranuleCell/*.hoc
19+
*_eden.py
20+
*_netpyne.py
21+
/NeuroML2/GranuleCell/simulator.props

‎.travis.yml‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

NeuroML/GranuleCell/Granule98.py renamed to NeuroML1/GranuleCell/Granule98.py

File renamed without changes.

NeuroML/GranuleCell/GranuleCell.net.xml renamed to NeuroML1/GranuleCell/GranuleCell.net.xml

File renamed without changes.

NeuroML/GranuleCell/README.md renamed to NeuroML1/GranuleCell/README.md

File renamed without changes.

NeuroML/GranuleCell/cells_channels/GranPassiveCond.xml renamed to NeuroML1/GranuleCell/cells_channels/GranPassiveCond.xml

File renamed without changes.

0 commit comments

Comments
 (0)