diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7154361..6c25d3fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,19 +35,17 @@ jobs: with: python-version: ${{ matrix.python-version }} - # Rely on latest release of modelspec... + # Rely on version of modelspec from PyPI as set by setup.cfg... #- name: Install modelspec # run: python -m pip install git+https://github.com/ModECI/modelspec.git@main + # Rely on version of NeuroMLlite from PyPI as set by setup.py... # - name: Install NeuroMLlite # run: python -m pip install NeuroMLlite>=0.5.0 - - name: Install GPy (py3.9) - if: ${{ matrix.python-version == '3.9' }} - run: python -m pip install git+https://github.com/SheffieldML/GPy.git@devel - - - name: Install specific PsyNeuLink branch - run: python -m pip install git+https://github.com/ModECI/PsyNeuLink@devel + # Rely on version of PsyNeuLink from PyPI as set by setup.py... + #- name: Install specific PsyNeuLink branch + # run: python -m pip install git+https://github.com/ModECI/PsyNeuLink@devel - name: Install core package run: python -m pip install .[dev] diff --git a/examples/NeuroML/LEMS_SimABCD.xml b/examples/NeuroML/LEMS_SimABCD.xml index c3b53b3e..677ba383 100644 --- a/examples/NeuroML/LEMS_SimABCD.xml +++ b/examples/NeuroML/LEMS_SimABCD.xml @@ -2,7 +2,7 @@ diff --git a/examples/NeuroML/LEMS_SimFN.png b/examples/NeuroML/LEMS_SimFN.png index 009cf743..03e1911f 100644 Binary files a/examples/NeuroML/LEMS_SimFN.png and b/examples/NeuroML/LEMS_SimFN.png differ diff --git a/examples/NeuroML/LEMS_SimFN.xml b/examples/NeuroML/LEMS_SimFN.xml index f04c912e..ddc09dde 100644 --- a/examples/NeuroML/LEMS_SimFN.xml +++ b/examples/NeuroML/LEMS_SimFN.xml @@ -2,7 +2,7 @@ diff --git a/setup.py b/setup.py index ce01a579..83767b00 100644 --- a/setup.py +++ b/setup.py @@ -5,8 +5,8 @@ # Most of this packages settings are defined in setup.cfg # FIXME: Not sure of the best way to setup extras_require from setup.cfg extras = { - "psyneulink": ["psyneulink>=0.11.0.0"], - "neuroml": ["pyNeuroML>=0.5.20", "neuromllite>=0.5.1"], + "psyneulink": ["psyneulink>=0.12.0.0"], + "neuroml": ["pyNeuroML>=0.5.20", "neuromllite>=0.5.2"], "test": [ "pytest", "pytest-benchmark",