Changeset 3a39c2e in sasview for sasmodels/setup.py

Timestamp:

Feb 13, 2015 3:53:03 AM (9 years ago)

Author:

krzywon

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:

8c9ffde

Parents:

79492222

Message:

Next iteration of the SANS→SAS is complete.

File:

• sasmodels/setup.py (modified) (5 diffs)

sasmodels/setup.py

@@ -1 +1 @@
 """
- Installation script for SANS models
+ Installation script for SAS models
 """
 
@@ -14 +14 @@
 
 # Manage version number ######################################
-sys.path.append(os.path.join("src", "sans"))
+sys.path.append(os.path.join("src", "sas"))
 import models
 VERSION = models.__version__
@@ -66 +66 @@
 from wrapping import generate_wrappers
 generate_wrappers(header_dir=includedir, 
-                  output_dir=os.path.join("src", "sans", "models"), 
+                  output_dir=os.path.join("src", "sas", "models"), 
                   c_wrapper_dir=wrapper_dir)
 
@@ -108 +108 @@
 
 dist = setup(
-    name="sansmodels",
+    name="sasmodels",
     version = VERSION,
-    description = "Python module for SANS scattering models",
-    author = "SANS/DANSE",
+    description = "Python module for SAS scattering models",
+    author = "SAS/DANSE",
     author_email = "sansdanse@gmail.gov",
     url = "http://sansviewproject.svn.sourceforge.net",
     
-    # Place this module under the sans package
-    #ext_package = "sans",
+    # Place this module under the sas package
+    #ext_package = "sas",
     
     # Use the pure python modules
-    package_dir = {"sans":os.path.join("src", "sans"),
-                   "sans.models":os.path.join("src", "sans", "models"),
-                   "sans.models.sans_extension":os.path.join("src", "sans", "models", "sans_extension"),
+    package_dir = {"sas":os.path.join("src", "sas"),
+                   "sas.models":os.path.join("src", "sas", "models"),
+                   "sas.models.sas_extension":os.path.join("src", "sas", "models", "sas_extension"),
                   },
-    package_data={'sans.models': [os.path.join('media', "*")]},
-    packages = ["sans","sans.models",
-                "sans.models.sans_extension",],
+    package_data={'sas.models': [os.path.join('media', "*")]},
+    packages = ["sas","sas.models",
+                "sas.models.sas_extension",],
     
     ext_modules = [ 
                    
-        Extension("sans.models.sans_extension.c_models",
+        Extension("sas.models.sas_extension.c_models",
                     sources=model_sources,                 
                     include_dirs=[igordir, includedir, c_model_dir, numpy_incl_path],   
@@ -135 +135 @@
 
         # Smearer extension
-        Extension("sans.models.sans_extension.smearer",
+        Extension("sas.models.sas_extension.smearer",
                    sources = smearer_sources,
                    include_dirs=[igordir, smear_dir, numpy_incl_path],
                    ),
                    
-        Extension("sans.models.sans_extension.smearer2d_helper",
+        Extension("sas.models.sas_extension.smearer2d_helper",
                   sources = [os.path.join(smear_dir, 
                                           "smearer2d_helper_module.cpp"),