OSBModelValidation 0.3.2__tar.gz → 0.3.5__tar.gz

{osbmodelvalidation-0.3.2 → osbmodelvalidation-0.3.5/OSBModelValidation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: OSBModelValidation
-Version: 0.3.2
+Version: 0.3.5
 Summary: Open Source Brain Model validation
 Home-page: https://github.com/OpenSourceBrain/osb-model-validation
 Author: Boris Marin, Padraig Gleeson
@@ -25,7 +25,6 @@ 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/OSBModelValidation)](https://pypi.org/project/OSBModelValidation/)
@@ -182,6 +181,7 @@ Running validation tests locally ensures that you can quickly check if any chang
 Since you can run the validation with different [engines](https://github.com/OpenSourceBrain/osb-model-validation/tree/master/omv/engines) to use different simulators, this also allows you to quickly verify that your model gives similar results using these different tools.
 
 
+
 ### Running tests automatically on GitHub Actions
 
 To use OMV with GHA, copy an existing configuration file, e.g. https://github.com/OpenSourceBrain/ACnet2/blob/master/.github/workflows/omv-ci.yml and place it in the required repository.

{osbmodelvalidation-0.3.2 → osbmodelvalidation-0.3.5}/OSBModelValidation.egg-info/requires.txt

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

{osbmodelvalidation-0.3.2/OSBModelValidation.egg-info → osbmodelvalidation-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: OSBModelValidation
-Version: 0.3.2
+Version: 0.3.5
 Summary: Open Source Brain Model validation
 Home-page: https://github.com/OpenSourceBrain/osb-model-validation
 Author: Boris Marin, Padraig Gleeson
@@ -25,7 +25,6 @@ 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/OSBModelValidation)](https://pypi.org/project/OSBModelValidation/)
@@ -182,6 +181,7 @@ Running validation tests locally ensures that you can quickly check if any chang
 Since you can run the validation with different [engines](https://github.com/OpenSourceBrain/osb-model-validation/tree/master/omv/engines) to use different simulators, this also allows you to quickly verify that your model gives similar results using these different tools.
 
 
+
 ### Running tests automatically on GitHub Actions
 
 To use OMV with GHA, copy an existing configuration file, e.g. https://github.com/OpenSourceBrain/ACnet2/blob/master/.github/workflows/omv-ci.yml and place it in the required repository.

{osbmodelvalidation-0.3.2 → osbmodelvalidation-0.3.5}/README.md

@@ -153,6 +153,7 @@ Running validation tests locally ensures that you can quickly check if any chang
 Since you can run the validation with different [engines](https://github.com/OpenSourceBrain/osb-model-validation/tree/master/omv/engines) to use different simulators, this also allows you to quickly verify that your model gives similar results using these different tools.
 
 
+
 ### Running tests automatically on GitHub Actions
 
 To use OMV with GHA, copy an existing configuration file, e.g. https://github.com/OpenSourceBrain/ACnet2/blob/master/.github/workflows/omv-ci.yml and place it in the required repository.

{osbmodelvalidation-0.3.2 → osbmodelvalidation-0.3.5}/omv/engines/getjnml.py

@@ -10,7 +10,7 @@ from omv.common.inout import inform
 def install_jnml(version):
 
     if not version:
-        version = "v0.13.2"
+        version = "v0.14.0"
 
     try:
         jnmlhome = os.environ["JNML_HOME"]

{osbmodelvalidation-0.3.2 → osbmodelvalidation-0.3.5}/omv/engines/getnetpyne.py

@@ -34,7 +34,6 @@ def install_netpyne(version=None):
 
         with working_dir(path):
             if sys.version_info.major == 2:
-                # pip_install([]'setuptools==42.0.1')
                 pip_install(
                     [
                         "kiwisolver==1.0.1",

{osbmodelvalidation-0.3.2 → osbmodelvalidation-0.3.5}/omv/engines/getnrn.py

@@ -1,7 +1,6 @@
 import os
 import sys
 from subprocess import check_output as co
-from distutils.core import run_setup
 from omv.common.inout import inform
 from omv.common.inout import pip_install
 
@@ -11,7 +10,7 @@ from omv.engines.utils.wdir import working_dir
 def install_neuron(version):
     if not version:
         if sys.version_info.major == 3:
-            version = "8.2.2"  # for pynn 0.11.0
+            version = "8.2.6"  # for pynn 0.11.0
         else:
             version = "7.6"
 
@@ -57,4 +56,4 @@ def install_neuron(version):
             print(co(["make", "install"]))
 
             os.chdir("src/nrnpython")
-            run_setup("./setup.py", ["install"])
+            print(co(["pip", "install", "."]))

{osbmodelvalidation-0.3.2 → osbmodelvalidation-0.3.5}/omv/validation/rx_validator.py

@@ -8,7 +8,7 @@ class RXSchemaValidator(object):
 
     def generate_schema(self, schema_src):
         schema = self.parse_yaml_file(schema_src)
-        print("generating schema from %s" % schema)
+        print("Generating schema from %s" % schema)
         return self.rx.make_schema(schema)
 
     def parse_yaml_file(self, fname):
@@ -18,7 +18,7 @@ class RXSchemaValidator(object):
 
     def validate(self, schema_src, doc_src):
         doc = self.parse_yaml_file(doc_src)
-        print("validating document %s" % doc)
+        print("Validating the document: %s" % doc)
         return self.generate_schema(schema_src).check(doc)
 
 

{osbmodelvalidation-0.3.2 → osbmodelvalidation-0.3.5}/omv/validation/validate.py

@@ -1,10 +1,10 @@
-from os.path import splitext, basename
+from os.path import splitext, basename, dirname
 from omv.validation.rx_validator import RXSchemaValidator
 from omv.validation.utils import topological_sort, all_types_in_schema
-from pkg_resources import resource_filename
 
 
 class OMVValidator(RXSchemaValidator):
+
     def __init__(self):
         super(OMVValidator, self).__init__()
         self.add_osb_prefix()
@@ -18,7 +18,11 @@ class OMVValidator(RXSchemaValidator):
         self.omv_types = {}
         from glob import glob
 
-        typedir = resource_filename("omv", "schemata/types/")
+        #typedir = resource_filename("omv", "schemata/types/")
+        typedir = dirname(dirname(__file__)) + "/schemata/types/"
+
+        print("Type directory: %s"%typedir)
+
         for omv in glob(typedir + "*.yaml") + glob(typedir + "/base/*.yaml"):
             tag = self.prefix + splitext(basename(omv))[0]
             print("registering", tag)

{osbmodelvalidation-0.3.2 → osbmodelvalidation-0.3.5}/omv/validation/validate_mep.py

@@ -1,13 +1,14 @@
 #!/usr/bin/env python
 import sys
 from omv.validation.validate import OMVValidator
-from pkg_resources import resource_filename
+from os.path import dirname
 
 
 def validate(mep_src):
     s = OMVValidator()
     print("Validating document againt mep schema: ")
-    schema = resource_filename("omv", "schemata/mep.yaml")
+    #schema = resource_filename("omv", "schemata/mep.yaml")
+    schema = dirname(dirname(__file__)) + "/schemata/mep.yaml"
     print(s.validate(schema, mep_src))
 
 

{osbmodelvalidation-0.3.2 → osbmodelvalidation-0.3.5}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = OSBModelValidation
-version = 0.3.2
+version = 0.3.5
 author = Boris Marin, Padraig Gleeson
 author_email = borismarin@gmail.com
 url = https://github.com/OpenSourceBrain/osb-model-validation
@@ -29,7 +29,6 @@ install_requires =
 	pathlib; python_version<'3.4'
 	docopt
 	importlib-metadata; python_version<'3.8'
-	setuptools
 packages = find:
 
 [options.packages.find]
@@ -42,6 +41,7 @@ console_scripts =
 
 [options.package_data]
 * = 
+	schemata/*
 	*.yaml
 	*.g