Changeset c089120 in sasview

Timestamp:

Aug 9, 2011 5:02:01 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:

c642155

Parents:

8e4cbd9

Message:

moved sans_extension inside of the model

File:

• sansmodels/src/setup.py (modified) (3 diffs)

sansmodels/src/setup.py

@@ -91 +91 @@
     
     # Use the pure python modules
-    package_dir = {"sans_extension":"sans/models/c_extensions",
+    package_dir = {"sans.models.sans_extension":"sans/models/c_extensions",
                    "sans.models.media":"sans/models/media"},
     package_data={'sans.models.media': ['*.gif','*.jpg','*.png','*.html']},
     packages = ["sans","sans.models","sans.models.test",
-                "sans_extension","sans.models.pyre",
+                "sans.models.sans_extension","sans.models.pyre",
                 "sans.models.media"],
     
-    ext_modules = [ Extension("sans_extension.c_models",
+    ext_modules = [ Extension("sans.models.sans_extension.c_models",
      sources = [
         "sans/models/c_models/c_models.cpp",
@@ -283 +283 @@
         include_dirs=[igordir,srcdir,"sans/models/c_models",numpy_incl_path]),       
         # Smearer extension
-        Extension("sans_extension.smearer",
+        Extension("sans.models.sans_extension.smearer",
                    sources = [
         "sans/models/c_smearer/smearer_module.cpp",
@@ -289 +289 @@
         ],
         include_dirs=["sans/models/c_smearer",numpy_incl_path]),
-        Extension("sans_extension.smearer2d_helper",
+        Extension("sans.models.sans_extension.smearer2d_helper",
                   sources = [
         "sans/models/c_smearer/smearer2d_helper_module.cpp",