OSBModelValidation 0.2.18__tar.gz → 0.2.20__tar.gz

osbmodelvalidation-0.2.20/LICENSE.lesser

@@ -0,0 +1,166 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+

{OSBModelValidation-0.2.18 → osbmodelvalidation-0.2.20/OSBModelValidation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OSBModelValidation
-Version: 0.2.18
+Version: 0.2.20
 Summary: Open Source Brain Model validation
 Home-page: https://github.com/OpenSourceBrain/osb-model-validation
 Author: Boris Marin, Padraig Gleeson
@@ -17,16 +17,18 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Scientific/Engineering
 Description-Content-Type: text/markdown
+License-File: LICENSE.lesser
 Requires-Dist: PyYAML
 Requires-Dist: numpy
 Requires-Dist: pyrx
 Requires-Dist: pathlib; python_version < "3.4"
 Requires-Dist: docopt
 Requires-Dist: importlib-metadata; python_version < "3.8"
+Requires-Dist: setuptools
 
 [![Continuous builds](https://github.com/OpenSourceBrain/osb-model-validation/actions/workflows/ci.yml/badge.svg)](https://github.com/OpenSourceBrain/osb-model-validation/actions/workflows/ci.yml)
-[![PyPI](https://img.shields.io/pypi/v/osb-model-validation)](https://pypi.org/project/osb-model-validation/)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/osb-model-validation)](https://pypi.org/project/osb-model-validation/)
+[![PyPI](https://img.shields.io/pypi/v/OSBModelValidation)](https://pypi.org/project/OSBModelValidation/)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/OSBModelValidation)](https://pypi.org/project/OSBModelValidation/)
 [![GitHub](https://img.shields.io/github/license/OpenSourceBrain/osb-model-validation)](https://github.com/OpenSourceBrain/osb-model-validation/blob/master/LICENSE.lesser)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/OpenSourceBrain/osb-model-validation)](https://github.com/OpenSourceBrain/osb-model-validation/pulls)
 [![GitHub issues](https://img.shields.io/github/issues/OpenSourceBrain/osb-model-validation)](https://github.com/OpenSourceBrain/osb-model-validation/issues)

{OSBModelValidation-0.2.18 → osbmodelvalidation-0.2.20}/OSBModelValidation.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+LICENSE.lesser
 MANIFEST.in
 README.md
 pyproject.toml

{OSBModelValidation-0.2.18 → osbmodelvalidation-0.2.20}/OSBModelValidation.egg-info/requires.txt

@@ -2,6 +2,7 @@ PyYAML
 numpy
 pyrx
 docopt
+setuptools
 
 [:python_version < "3.4"]
 pathlib

{OSBModelValidation-0.2.18/OSBModelValidation.egg-info → osbmodelvalidation-0.2.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OSBModelValidation
-Version: 0.2.18
+Version: 0.2.20
 Summary: Open Source Brain Model validation
 Home-page: https://github.com/OpenSourceBrain/osb-model-validation
 Author: Boris Marin, Padraig Gleeson
@@ -17,16 +17,18 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Scientific/Engineering
 Description-Content-Type: text/markdown
+License-File: LICENSE.lesser
 Requires-Dist: PyYAML
 Requires-Dist: numpy
 Requires-Dist: pyrx
 Requires-Dist: pathlib; python_version < "3.4"
 Requires-Dist: docopt
 Requires-Dist: importlib-metadata; python_version < "3.8"
+Requires-Dist: setuptools
 
 [![Continuous builds](https://github.com/OpenSourceBrain/osb-model-validation/actions/workflows/ci.yml/badge.svg)](https://github.com/OpenSourceBrain/osb-model-validation/actions/workflows/ci.yml)
-[![PyPI](https://img.shields.io/pypi/v/osb-model-validation)](https://pypi.org/project/osb-model-validation/)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/osb-model-validation)](https://pypi.org/project/osb-model-validation/)
+[![PyPI](https://img.shields.io/pypi/v/OSBModelValidation)](https://pypi.org/project/OSBModelValidation/)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/OSBModelValidation)](https://pypi.org/project/OSBModelValidation/)
 [![GitHub](https://img.shields.io/github/license/OpenSourceBrain/osb-model-validation)](https://github.com/OpenSourceBrain/osb-model-validation/blob/master/LICENSE.lesser)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/OpenSourceBrain/osb-model-validation)](https://github.com/OpenSourceBrain/osb-model-validation/pulls)
 [![GitHub issues](https://img.shields.io/github/issues/OpenSourceBrain/osb-model-validation)](https://github.com/OpenSourceBrain/osb-model-validation/issues)

{OSBModelValidation-0.2.18 → osbmodelvalidation-0.2.20}/README.md

@@ -1,6 +1,6 @@
 [![Continuous builds](https://github.com/OpenSourceBrain/osb-model-validation/actions/workflows/ci.yml/badge.svg)](https://github.com/OpenSourceBrain/osb-model-validation/actions/workflows/ci.yml)
-[![PyPI](https://img.shields.io/pypi/v/osb-model-validation)](https://pypi.org/project/osb-model-validation/)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/osb-model-validation)](https://pypi.org/project/osb-model-validation/)
+[![PyPI](https://img.shields.io/pypi/v/OSBModelValidation)](https://pypi.org/project/OSBModelValidation/)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/OSBModelValidation)](https://pypi.org/project/OSBModelValidation/)
 [![GitHub](https://img.shields.io/github/license/OpenSourceBrain/osb-model-validation)](https://github.com/OpenSourceBrain/osb-model-validation/blob/master/LICENSE.lesser)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/OpenSourceBrain/osb-model-validation)](https://github.com/OpenSourceBrain/osb-model-validation/pulls)
 [![GitHub issues](https://img.shields.io/github/issues/OpenSourceBrain/osb-model-validation)](https://github.com/OpenSourceBrain/osb-model-validation/issues)

{OSBModelValidation-0.2.18 → osbmodelvalidation-0.2.20}/omv/engines/brian2_.py

@@ -17,7 +17,7 @@ class Brian2Engine(OMVEngine):
             inform(
                 "Brian2 version %s is correctly installed..." % brian2.__version__,
                 indent=2,
-                verbosity=2,
+                verbosity=1,
             )
 
             ret = "v%s" % brian2.__version__

{OSBModelValidation-0.2.18 → osbmodelvalidation-0.2.20}/omv/engines/jneuroml.py

@@ -81,6 +81,10 @@ class JNeuroMLEngine(OMVEngine):
         inform("Will fetch and install jNeuroML jar", indent=2)
         install_jnml(version)
 
+        if not JNeuroMLEngine.is_installed():
+            inform("Failure to install, exiting", indent=1)
+            exit(1)
+
     def run(self):
         try:
             inform(

{OSBModelValidation-0.2.18 → osbmodelvalidation-0.2.20}/omv/engines/jneuromlmoose.py

@@ -8,6 +8,7 @@ from omv.engines.engine import EngineExecutionError
 
 
 class JNeuroMLMooseEngine(JNeuroMLEngine):
+
     name = "jNeuroML_Moose"
 
     @staticmethod
@@ -21,10 +22,11 @@ class JNeuroMLMooseEngine(JNeuroMLEngine):
 
     @staticmethod
     def install(version):
+
         if not JNeuroMLEngine.is_installed():
             JNeuroMLEngine.install(None)
         if not MooseEngine.is_installed():
-            MooseEngine.install(None)
+            MooseEngine.install(version)
 
         JNeuroMLMooseEngine.path = JNeuroMLEngine.path + ":" + JNeuroMLMooseEngine.path
         JNeuroMLMooseEngine.environment_vars = {}
@@ -32,6 +34,7 @@ class JNeuroMLMooseEngine(JNeuroMLEngine):
         JNeuroMLMooseEngine.environment_vars.update(MooseEngine.environment_vars)
         inform("PATH: " + JNeuroMLMooseEngine.path)
         inform("Env vars: %s" % JNeuroMLMooseEngine.environment_vars)
+        
 
     def run(self):
         try:

{OSBModelValidation-0.2.18 → osbmodelvalidation-0.2.20}/omv/engines/moose_.py

@@ -10,44 +10,24 @@ from omv.engines.engine import OMVEngine, EngineExecutionError
 class MooseEngine(OMVEngine):
     name = "Moose"
 
+
     @staticmethod
     def is_installed():
-        if is_verbose():
-            inform(
-                "Checking whether the engine %s has been installed correctly..."
-                % MooseEngine.name,
-                indent=1,
-            )
-
         ret = True
         try:
-            ret_str = sp.check_output(
-                ['python -c "import moose; print(moose.__version__)"'],
-                shell=True,
-                stderr=sp.STDOUT,
-            )
-            ret = len(ret_str) > 0
+            import moose
 
-            if isinstance(ret_str, bytes):
-                ret_str = ret_str.decode("utf-8").strip()
+            inform(
+                "Moose version %s is correctly installed..." % moose.__version__,
+                indent=2,
+                verbosity=1,
+            )
 
-            if ret and is_verbose():
-                inform(
-                    "%s is correctly installed (%s)..." % (MooseEngine.name, ret_str),
-                    indent=2,
-                )
-            if ret:
-                # import moose
-                ret = "v%s" % ret_str
+            ret = "v%s" % moose.__version__
 
         except Exception as err:
-            if is_verbose():
-                inform("Couldn't import moose into Python: ", err, indent=1)
+            inform("Couldn't import Moose into Python: ", err, indent=1, verbosity=1)
             ret = False
-        if not ret or not PyNeuroMLEngine.is_installed():
-            ret = False
-
-        inform("Moose is_installed(): %s" % ret, "", indent=1, verbosity=2)
         return ret
 
     @staticmethod

{OSBModelValidation-0.2.18 → osbmodelvalidation-0.2.20}/omv/engines/pyneuroml_.py

@@ -38,6 +38,11 @@ class PyNeuroMLEngine(OMVEngine):
         inform("Will fetch and install the latest pyNeuroML", indent=2)
         install_pynml(version)
 
+        if not PyNeuroMLEngine.is_installed():
+            inform("Failure to install, exiting", indent=1)
+            exit(1)
+
+
     def run(self):
         try:
             inform(

{OSBModelValidation-0.2.18 → osbmodelvalidation-0.2.20}/omv/omv_util.py

@@ -339,19 +339,25 @@ def _install_engine(eng):
             from omv.engines.getgenesis import install_genesis
 
             install_genesis()
+
         elif eng.lower() == "Moose".lower():
-            if engine_version is not None:
-                raise Exception(
-                    "Currently, cannot install a specific version of engine %s" % eng
-                )
-            from omv.engines.getmoose import install_moose
 
-            install_moose(engine_version)
+            from omv.engines.moose_ import MooseEngine as ee
+
+            if ee.is_installed():
+                already_installed = True
+            else:
+                from omv.engines.getmoose import install_moose
+
+                install_moose(engine_version)
+
         elif eng.lower() == "NetPyNE".lower():
             from omv.engines.getnetpyne import install_netpyne
 
             install_netpyne(engine_version)
+
         elif eng.lower() == "Brian".lower():
+
             if engine_version is not None:
                 raise Exception(
                     "Currently, cannot install a specific version of engine %s" % eng
@@ -359,10 +365,17 @@ def _install_engine(eng):
             from omv.engines.getbrian1 import install_brian
 
             install_brian()
+
         elif eng.lower() == "Brian2".lower():
-            from omv.engines.getbrian2 import install_brian2
+            from omv.engines.brian2_ import Brian2Engine as ee
+
+            if ee.is_installed():
+                already_installed = True
+            else:
+                from omv.engines.getbrian2 import install_brian2
+
+                install_brian2(engine_version)
 
-            install_brian2(engine_version)
         elif eng.lower() == "NEST".lower():
             from omv.engines.nestsli import NestEngine as ee
 
@@ -372,6 +385,7 @@ def _install_engine(eng):
                 from omv.engines.getnest import install_nest
 
                 install_nest(engine_version)
+
         elif eng.lower() == "PyNEST".lower():
             from omv.engines.pynest import PyNestEngine as ee
 
@@ -403,6 +417,14 @@ def _install_engine(eng):
             else:
                 ee.install(engine_version)
 
+        elif eng.lower() == "jNeuroML_Moose".lower():
+            from omv.engines.jneuromlmoose import JNeuroMLMooseEngine as ee
+
+            if ee.is_installed():
+                already_installed = True
+            else:
+                ee.install(engine_version)
+
         elif eng.lower() == "jNeuroML_NEURON".lower():
             from omv.engines.jneuromlnrn import JNeuroMLNRNEngine as ee
 

{OSBModelValidation-0.2.18 → osbmodelvalidation-0.2.20}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = OSBModelValidation
-version = 0.2.18
+version = 0.2.20
 author = Boris Marin, Padraig Gleeson
 author_email = borismarin@gmail.com
 url = https://github.com/OpenSourceBrain/osb-model-validation
@@ -28,6 +28,7 @@ install_requires =
 	pathlib; python_version<'3.4'
 	docopt
 	importlib-metadata; python_version<'3.8'
+	setuptools
 packages = find:
 
 [options.packages.find]