Merge pull request #501 from ModECI/development

To v0.4.9

Author: pgleeson

.github/workflows/ci.yml

@@ -13,8 +13,8 @@ jobs:
     name: Format
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: "3.10"
     - uses: pre-commit/[email protected]
@@ -27,13 +27,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.8", "3.9", "3.10"]
+        python-version: [ "3.8", "3.10", "3.11"]
         runs-on: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -62,48 +62,37 @@ jobs:
 
     - name: Install most optional dependencies
       run: |
-        python -m pip install .[all_except_psyneulink]
+        python -m pip install .[optional]
 
     - name: Version info for optional installed packages
       run: |
           pip list
 
     - name: Install graphviz
-      if: ${{ matrix.runs-on != 'windows-latest' }}
-      run: |
-        if [[  ${{ matrix.runs-on }} == *"macos"* ]]; then brew install graphviz ; fi
-        if [[  ${{ matrix.runs-on }} == *"ubuntu"* ]]; then sudo apt install graphviz ; fi
+      uses: ts-graphviz/setup-graphviz@v1
 
     - name: Test interface ACT-R
-      if: ${{ matrix.python-version != '3.10' || matrix.runs-on != 'windows-latest' }}
       run: |
         python -m pytest -v -m "actr" tests/
 
     - name: Test interface PyTorch
-      if: ${{ matrix.python-version != '3.10' || matrix.runs-on != 'windows-latest' }}
       run: |
         python -m pytest -v -m "pytorch" tests/
 
     - name: Test interface NeuroML
-      if: ${{ matrix.python-version != '3.10' || matrix.runs-on != 'windows-latest' }}
       run: |
+        python -m pip install .[neuroml]
         python -m pytest -v -m "neuroml" tests/
 
-    - name: Test interface TensorFlow linux/mac
-      if: ${{ matrix.runs-on != 'windows-latest' }}
-      run: |
-        dot -V
-        python -m pytest -v -m "tensorflow" tests/
-
-    - name: Test interface TensorFlow windows
-      if: ${{ matrix.python-version != '3.10' && matrix.runs-on == 'windows-latest' }}
+    - name: Test interface TensorFlow
+      if: ${{ matrix.python-version != '3.11'}}
       run: |
-        choco install graphviz
+        python -m pip install .[tensorflow]
         dot -V
         python -m pytest -v -m "tensorflow" tests/
 
     - name: Test interface PsyNeuLink
-      if: ${{ matrix.python-version != '3.10' }}
+      if: ${{ matrix.python-version != '3.11'}}
       run: |
         python -m pip install .[psyneulink]
         python -m pytest -v -m "psyneulink" tests/
@@ -125,7 +114,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Build sdist and wheel
       run: pipx run --spec build pyproject-build

.gitignore

@@ -307,3 +307,4 @@ examples/TensorFlow/Keras/keras_to_MDF
 /examples/TensorFlow/Keras/MNIST/keras_to_MDF
 /examples/TensorFlow/Keras/MNIST/keras_to_MDF.1
 /examples/TensorFlow/Keras/IRIS/keras_to_MDF.1
+/checkout_pngs.sh