From 917f3cc91eec3a5220dbb02db8d3669b49b32ebd Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 26 Jun 2024 16:19:31 +0100 Subject: [PATCH] Include install in test... --- .github/workflows/non_omv.yml | 3 ++- c302/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/non_omv.yml b/.github/workflows/non_omv.yml index 918d6f36..7a938dd0 100644 --- a/.github/workflows/non_omv.yml +++ b/.github/workflows/non_omv.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: runs-on: [ubuntu-latest, macos-12, macos-latest ] - python-version: [ 3.8, 3.9, "3.10" ] + python-version: [ 3.8, 3.9, "3.10", "3.11" ] exclude: - runs-on: macos-latest python-version: "3.8" @@ -44,6 +44,7 @@ jobs: - name: Test OpenWormReader with owmeta run: | + pip install owmeta>=0.12.3 owm bundle remote --user add ow 'https://raw.githubusercontent.com/openworm/owmeta-bundles/master/index.json' python -m c302.OpenWormReader diff --git a/c302/__init__.py b/c302/__init__.py index 89b5ee22..5cfd3675 100755 --- a/c302/__init__.py +++ b/c302/__init__.py @@ -623,8 +623,8 @@ def generate(net_id, info = "\n\nParameters and setting used to generate this network:\n\n"+\ " Data reader: %s\n" % data_reader+\ " c302 version: %s\n" % __version__+\ - " owmeta version: %s\n" % ('' if not owmeta_installed else owmeta_version) +\ - " owmeta_core version: %s\n" % ('' if not owmeta_installed else owc_version) +\ + " owmeta version: %s\n" % ('- not installed -' if not owmeta_installed else owmeta_version) +\ + " owmeta_core version: %s\n" % ('- not installed -' if not owmeta_installed else owc_version) +\ " Cells: %s\n" % (cells if cells is not None else "All cells")+\ " Cell stimulated: %s\n" % (cells_to_stimulate if cells_to_stimulate is not None else "All neurons")+\ " Connection: %s\n" % (conns_to_include if conns_to_include is not None else "All connections") + \