Changeset 206c87c in sasmodels for sascomp

Timestamp:

Mar 19, 2016 8:30:46 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

ed048b2

Parents:

a78bebc (diff), 12dbc90 (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' of github.com:sasview/sasmodels

File:

• sascomp (modified) (1 diff)

sascomp

@@ -8 +8 @@
     sasmodels = os.path.dirname(os.path.realpath(__file__))
     root = os.path.dirname(sasmodels)
-    sasview=glob.glob(os.path.join(root, 'sasview', 'build', 'lib.*' ))[0]
+    sasview=glob.glob(os.path.join(root, 'sasview', 'build', 'lib.*' ))
     sys.path.insert(0, os.path.join(root, 'bumps'))
     sys.path.insert(0, os.path.join(root, 'periodictable'))
-    sys.path.insert(0, sasview)
+    if sasview:  # glob returns a list
+        sys.path.insert(0, sasview[0])
     sys.path.insert(0, sasmodels)