Changeset f9393dc in sasview

Timestamp:

Feb 20, 2015 5:26:23 AM (9 years ago)

Author:

pkienzle

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:

8a428fc

Parents:

c3caa49

Message:

remove park refs from build/run

Files:

• run.py (modified) (2 diffs)
• setup.py (modified) (2 diffs)

run.py

@@ -103 +103 @@
     # Put the source trees on the path
     addpath(joinpath(root, 'src'))
-    addpath(joinpath(root, 'park-1.2.1'))
 
     # Import the sasview package from root/sasview as sas.sasview.  It would
@@ -118 +117 @@
     sas.pr.core = import_package('sas.pr.core',
                                   joinpath(build_path, 'sas', 'pr', 'core'))
-    #import_dll('park._modeling', build_path)
 
-    #park = import_package('park',os.path.join(build_path,'park'))
 
     # Pull the entire sas.models package from the build directory since it contains

setup.py

@@ -207 +207 @@
                               ) )
         
-# sas.fit (park integration)
+# sas.fit
 package_dir["sas.fit"] = os.path.join("src", "sas", "fit")
 packages.append("sas.fit")
@@ -237 +237 @@
 package_dir["sas.plottools"] = os.path.join("src", "sas", "plottools")
 packages.append("sas.plottools")
-
-# Park 1.2.1
-package_dir["park"]="park-1.2.1/park"
-packages.extend(["park"])
-package_data["park"] = ['park-1.2.1/*.txt', 'park-1.2.1/park.epydoc']
-ext_modules.append( Extension("park._modeling",
-                              sources = [ os.path.join("park-1.2.1", 
-                                                "park", "lib", "modeling.cc"),
-                                         os.path.join("park-1.2.1", 
-                                                "park", "lib", "resolution.c"),
-                                         ],
-                              ) )
 
 # sas models