Changeset ca3072fb in sasview for sansmodels/src

Timestamp:

Aug 9, 2011 3:48:27 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

cf3042e

Parents:

c6b0763

Message:

updated directory paths

Location:

sansmodels/src

Files:

• MANIFEST.IN (modified) (1 diff)
• setup.py (modified) (4 diffs)

sansmodels/src/MANIFEST.IN

@@ -1 @@
-graft media
-graft libigor
+graft sans/models/media
+graft sans/models/libigor
 graft sans/models/c_models
 recursive-include sans *.h

sansmodels/src/setup.py

@@ -12 +12 @@
 import sys
 import os
+if len(sys.argv) == 1:
+    sys.argv.append('install')
     
 from numpy.distutils.misc_util import get_numpy_include_dirs
@@ -72 +74 @@
 # Build the module name
 srcdir  = "sans/models/c_extensions"
-igordir = "libigor"
+igordir = "sans/models/libigor"
 
 print "Installing SANS models"
@@ -78 +80 @@
 
 dist = setup(
-    name="models",
+    name="sans.models",
     version = "0.9.1",
     description = "Python module for SANS scattering models",
@@ -90 +92 @@
     # Use the pure python modules
     package_dir = {"sans_extension":"sans/models/c_extensions",
-                   "sans.models.media":"media"},
+                   "sans.models.media":"sans/models/media"},
     package_data={'sans.models.media': ['*.gif','*.jpg','*.png','*.html']},
     packages = ["sans","sans.models","sans.models.test",