Changeset f0e09d6 in sasmodels

Timestamp:

Aug 7, 2017 7:11:24 AM (7 years ago)

Author:

lewis

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

9826f82

Parents:

f2cbeb7 (diff), 997c9ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket-754

Location:

sasmodels

Files:

• __init__.py (modified) (1 diff)
• model_test.py (modified) (3 diffs)

sasmodels/__init__.py

@@ -14 +14 @@
 defining new models.
 """
-__version__ = "0.94"
+__version__ = "0.97"
 
 def data_files():

sasmodels/model_test.py

@@ -47 +47 @@
 import sys
 import unittest
+from StringIO import StringIO
 
 import numpy as np  # type: ignore
@@ -350 +351 @@
 
     # Build a object to capture and print the test results
-    stream = _WritelnDecorator(sys.stdout)  # Add writeln() method to stream
+    stream = _WritelnDecorator(StringIO())  # Add writeln() method to stream
     verbosity = 2
     descriptions = True
@@ -388 +389 @@
     else:
         stream.writeln("Note: no test suite created --- this should never happen")
+
+    output = stream.getvalue()
+    stream.close()
+    return output