Feat/document pynml

docs/requirements.txt

@@ -1 +1,13 @@
 sphinxcontrib-bibtex
+lxml
+airspeed
+opencv-python
+libneuroml
+pyelectro
+matplotlib
+scipy
+pylems
+graphviz
+argparse
+neuromllite
+git+https://github.com/NeuralEnsemble/neurotune.git#egg=neurotune

docs/source/conf.py

@@ -10,9 +10,9 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
+import os
+import sys
+sys.path.insert(0, os.path.abspath('../../'))
 
 
 # -- Project information -----------------------------------------------------

examples/units.py

@@ -3,7 +3,7 @@
 
 def test_conversion(nml2_quantity, unit, expected, should_fail=False):
     try:
-        val = pynml.convert_to_units(nml2_quantity, unit, True)
+        val = pynml.convert_to_units(nml2_quantity, unit)
         print('  Converted %s -> %s %s (expecting: %s)' % (nml2_quantity, val, unit, expected))
         assert abs(val / expected - 1) < 1e-12
     except Exception as e:

pyneuroml/povray/MakeMovie.py

@@ -1,5 +1,4 @@
 import cv2
-import cv
 import colorsys
 import argparse
 import sys
@@ -196,7 +195,7 @@ def main(argv):
 
         fps = 24
         if format == 'avi':
-            fourcc = cv.CV_FOURCC('X', 'V', 'I', 'D')
+            fourcc = cv2.VideoWriter_fourcc('X', 'V', 'I', 'D')
             mov_file = args.name + '.avi'
             out = cv2.VideoWriter(mov_file, fourcc, fps, (width, height))
         if format == 'divx':