Merge pull request #527 from ModECI/development

ONNX updates

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: "3.10"
-    - uses: pre-commit/[email protected].0
+    - uses: pre-commit/[email protected].1
       with:
         extra_args: --hook-stage manual --all-files
 
@@ -27,8 +27,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.8", "3.10", "3.11"]
+        python-version: [ "3.9", "3.10", "3.11"]
         runs-on: [ubuntu-latest, macos-latest, windows-latest]
+        exclude:
+          - runs-on: macos-latest
+            python-version: "3.9"
 
     steps:
     - uses: actions/checkout@v4
@@ -49,6 +52,11 @@ jobs:
     #- name: Install specific PsyNeuLink branch
     #  run: python -m pip install git+https://github.com/ModECI/PsyNeuLink@devel
 
+    - name: Install HDF5 for pytables on macos-14/latest
+      if: ${{ matrix.runs-on == 'macos-latest' }}
+      run: |
+        brew install hdf5
+
     - name: Install core package
       run: python -m pip install .[dev]
 
@@ -69,7 +77,10 @@ jobs:
           pip list
 
     - name: Install graphviz
-      uses: ts-graphviz/setup-graphviz@v1
+      uses: ts-graphviz/setup-graphviz@v2
+      with:
+        # Skip to run brew update command on macOS.
+        macos-skip-brew-update: 'true' # default false
 
     - name: Test interface ACT-R
       run: |
@@ -85,7 +96,6 @@ jobs:
         python -m pytest -v -m "neuroml" tests/
 
     - name: Test interface TensorFlow
-      if: ${{ matrix.python-version != '3.11'}}
       run: |
         python -m pip install .[tensorflow]
         dot -V
@@ -119,7 +129,7 @@ jobs:
     - name: Build sdist and wheel
       run: pipx run --spec build pyproject-build
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         path: dist
 

.gitignore

@@ -308,3 +308,5 @@ examples/TensorFlow/Keras/keras_to_MDF
 /examples/TensorFlow/Keras/MNIST/keras_to_MDF.1
 /examples/TensorFlow/Keras/IRIS/keras_to_MDF.1
 /checkout_pngs.sh
+/examples/TensorFlow/Keras/IRIS/keras_model_on_iris.keras
+/examples/TensorFlow/Keras/MNIST/kr_N_model.keras