Merge pull request SDXorg#1 from sepiatone/my_tests

My tests

.gitignore

@@ -5,4 +5,5 @@ build/
 *.2mdl
 pysd.egg*
 
-.idea/*
+.idea/*
+docs/_build/*

.travis.yml

@@ -1,7 +1,7 @@
 language: python
 python:
-  - "2.7"
-  - "3.5"
+#  - "2.7"
+# - "3.5"
   - "3.6"
 # command to install dependencies
 cache: pip
@@ -16,4 +16,4 @@ install:
 script:
     - cd tests
     - nosetests --with-coverage --cover-package=pysd
-    - coveralls
+    - coveralls

pysd/testing.py

@@ -124,8 +124,16 @@ def extreme_conditions_test(model, matrix=None, excel_file=None, errors='return'
 
 
 def _get_bounds(unit_string):
-    parts = unit_string.split('[')
-    return parts[-1].strip(']').split(',') if len(parts) > 1 else ['?', '?']
+    return unit_string.strip('() ').split(',')
+
+
+def _set_bounds(unit_string, type="Min"):
+    if unit_string.strip(' ') == "None" and type == "Min":
+        return float('-inf')
+    elif unit_string.strip(' ') == "None" and type == "Max":
+        return float('+inf')
+    else:
+        return float(unit_string)
 
 
 def create_bounds_test_matrix(model, filename=None):
@@ -151,9 +159,9 @@ def create_bounds_test_matrix(model, filename=None):
     """
 
     docs = model.doc()
-    docs['bounds'] = docs['Unit'].apply(_get_bounds)
-    docs['Min'] = docs['bounds'].apply(lambda x: float(x[0].replace('?', '-inf')))
-    docs['Max'] = docs['bounds'].apply(lambda x: float(x[1].replace('?', '+inf')))
+    docs['bounds'] = docs['Lims'].apply(_get_bounds)
+    docs['Min'] = docs['bounds'].apply(lambda x: float(_set_bounds(x[0], "Min")))
+    docs['Max'] = docs['bounds'].apply(lambda x: float(_set_bounds(x[1], "Max")))
 
     output = docs[['Real Name', 'Comment',
                    'Unit', 'Min', 'Max']].sort_values(by='Real Name')