Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
202047e
Merge pull request #578 from ModECI/development
pgleeson May 27, 2026
a4e319d
Merge pull request #579 from ModECI/development
pgleeson May 28, 2026
6ddb20d
Bump actions/checkout from 6 to 7
dependabot[bot] Jun 24, 2026
4279851
Update checkout action version in CI workflow
pgleeson Jun 24, 2026
e50eda0
To v0.4.15; run big test_all on 3.12 for now...
pgleeson Jun 24, 2026
fa70085
More verbose install, for debug
pgleeson Jun 24, 2026
020427b
pip install psyneulink from https://github.com/PrincetonUniversity/Ps…
pgleeson Jun 24, 2026
ef59d7c
Bump pypa/gh-action-pypi-publish from 1.14.0 to 1.14.1
dependabot[bot] Jul 22, 2026
fc4929e
Bump actions/setup-python from 6 to 7
dependabot[bot] Jul 22, 2026
d6d78da
Merge branch 'dependabot/github_actions/actions/setup-python-7' into …
pgleeson Jul 22, 2026
6ce1556
Fix formatting
pgleeson Jul 22, 2026
72e6756
Allow latest modelspec
pgleeson Jul 24, 2026
a441424
Merge branch 'dependabot/github_actions/pypa/gh-action-pypi-publish-1…
pgleeson Jul 29, 2026
f1c39b6
Merge branch 'dependabot/github_actions/actions/checkout-7' into test…
pgleeson Jul 29, 2026
f74354c
Merge branch 'test_main' into nml_examples
pgleeson Jul 29, 2026
252b803
Test install latest psyneulink
pgleeson Jul 29, 2026
c79ad07
Bump pypa/gh-action-pypi-publish from 1.14.0 to 1.14.2
dependabot[bot] Aug 5, 2026
d2a8458
Merge remote-tracking branch 'origin/dependabot/github_actions/pypa/g…
pgleeson Aug 5, 2026
ad53201
Exclude tensorflow test on macos due to slowness
pgleeson Aug 5, 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
18 changes: 10 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
name: Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
- uses: actions/checkout@v7
- uses: actions/setup-python@v7
with:
python-version: '3.10'
- uses: pre-commit/action@v3.0.1
Expand All @@ -36,12 +36,14 @@ jobs:
exclude:
- os: windows-latest
test-suite: tensorflow
- os: macos-latest
test-suite: tensorflow # too slow...

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Setup Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -86,8 +88,8 @@ jobs:
needs: tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
- uses: actions/checkout@v7
- uses: actions/setup-python@v7
with:
python-version: '3.11'
- name: Install uv and set the python version
Expand All @@ -107,13 +109,13 @@ jobs:
name: Distribution build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Build sdist & wheel
run: pipx run --spec build pyproject-build
- uses: actions/upload-artifact@v7
with:
path: dist
- uses: pypa/gh-action-pypi-publish@v1.14.0
- uses: pypa/gh-action-pypi-publish@v1.14.2
if: github.event_name == 'release' && github.event.action == 'published'
with:
user: __token__
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/ci_test_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.13"]
python-version: [ "3.12"]
runs-on: [ubuntu-latest]

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- uses: actions/setup-python@v6
- uses: actions/setup-python@v7
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -37,7 +37,11 @@ jobs:

- name: Run test script
run: |
# pip install torch==2.8.0 # pinned to avoid issues with latest version taking up too much space...
python -m pip install -U pip

# pip install psyneulink from https://github.com/PrincetonUniversity/PsyNeuLink, branch devel
pip install psyneulink

export NEURON_HOME=$pythonLocation
./test_all.sh

Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/api/export_format/ACT-R/addition.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"addition": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"addition_graph": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/api/export_format/ACT-R/addition.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addition:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
addition_graph:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/api/export_format/ACT-R/count.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"count": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"count_graph": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/api/export_format/ACT-R/count.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
count:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
count_graph:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/api/export_format/ONNX/ab.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"ONNX Model": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"main_graph": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/api/export_format/ONNX/ab.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ONNX Model:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
main_graph:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/api/export_format/ONNX/abc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"ONNX Model": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"main_graph": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/api/export_format/ONNX/abc.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ONNX Model:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
main_graph:
nodes:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"ONNX Model": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"main_graph": {
"nodes": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ONNX Model:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
main_graph:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/api/export_format/ONNX/abcd.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"ONNX Model": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"main_graph": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/api/export_format/ONNX/abcd.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ONNX Model:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
main_graph:
nodes:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"InceptionBlocks": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"InceptionBlocksGraph": {
"nodes": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"mlp_pure_mdf": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"mlp_pure_mdf": {
"nodes": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mlp_pure_mdf:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
mlp_pure_mdf:
nodes:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"SimpleNet": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"SimpleNetGraph": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion examples/ACT-R/addition.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"addition": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"addition_graph": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion examples/ACT-R/addition.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addition:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
addition_graph:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion examples/ACT-R/count.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"count": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"count_graph": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion examples/ACT-R/count.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
count:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
count_graph:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/ABCD.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"ABCD": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"abcd_example": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/ABCD.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ABCD:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
abcd_example:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/Arrays.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Arrays": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"array_example": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/Arrays.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Arrays:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
array_example:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/NewtonCoolingModel.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"NewtonCoolingModel": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"cooling_process": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/NewtonCoolingModel.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
NewtonCoolingModel:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
cooling_process:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/ParametersFunctions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"ParametersFunctions": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"params_funcs_example": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/ParametersFunctions.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ParametersFunctions:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
params_funcs_example:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/RNN/IAF_net.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"IAF_net": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"iaf_example": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/RNN/IAF_net.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
IAF_net:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
iaf_example:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/RNN/IAF_net2.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"IAF_net2": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"iaf_example": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/RNN/IAF_net2.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
IAF_net2:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
iaf_example:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/RNN/IAF_net3.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"IAF_net3": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"iaf_example": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/RNN/IAF_net3.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
IAF_net3:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
iaf_example:
nodes:
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/RNN/IAFs.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"IAFs": {
"format": "ModECI MDF v0.4",
"generating_application": "Python modeci-mdf v0.4.14",
"generating_application": "Python modeci-mdf v0.4.15",
"graphs": {
"iaf_example": {
"nodes": {
Expand Down
2 changes: 1 addition & 1 deletion examples/MDF/RNN/IAFs.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
IAFs:
format: ModECI MDF v0.4
generating_application: Python modeci-mdf v0.4.14
generating_application: Python modeci-mdf v0.4.15
graphs:
iaf_example:
nodes:
Expand Down
Loading
Loading