Changeset cd5e29b in sasview for setup.py

Timestamp:

Sep 1, 2015 7:20:05 AM (9 years ago)

Author:

ajj

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:

f0d720b

Parents:

40c5104 (diff), 600bea1 (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' into sasmodels-integration

File:

• setup.py (modified) (5 diffs)

setup.py

@@ -158 +158 @@
         sys.path.append("docs/sphinx-docs")
         import build_sphinx
-
-        build_sphinx.clean()
-        build_sphinx.retrieve_user_docs()
-        build_sphinx.apidoc()
-        build_sphinx.build()
+        build_sphinx.rebuild()
 
 # sas module
@@ -207 +203 @@
                               ) )
         
-# sas.fit (park integration)
+# sas.fit
 package_dir["sas.fit"] = os.path.join("src", "sas", "fit")
 packages.append("sas.fit")
@@ -237 +233 @@
 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
@@ -360 +344 @@
 
 package_dir["sas.sasview"] = "sasview"
-package_data['sas.sasview'] = ['images/*', 'media/*', 'test/*', 
+package_data['sas.sasview'] = ['images/*', 
+                               'media/*',
+                               'test/*.txt',
+                               'test/1d_data/*',
+                               'test/2d_data/*',
+                               'test/save_states/*',
+                               'test/upcoming_formats/*', 
                                  'default_categories.json']
 packages.append("sas.sasview")
 
 required = [
-    'bumps>=0.7.5.4', 'periodictable>=1.3.1', 'pyparsing<2.0.0',
+    'bumps>=0.7.5.6', 'periodictable>=1.3.1', 'pyparsing<2.0.0',
 
     # 'lxml>=2.2.2',
@@ -386 +376 @@
     version = VERSION,
     description = "SasView application",
-    author = "University of Tennessee",
-    author_email = "sansdanse@gmail.com",
+    author = "SasView Team",
+    author_email = "developers@sasview.org",
     url = "http://sasview.org",
     license = "PSF",
     keywords = "small-angle x-ray and neutron scattering analysis",
-    download_url = "https://sourceforge.net/projects/sansviewproject/files/",
+    download_url = "https://github.com/SasView/sasview.git",
     package_dir = package_dir,
     packages = packages,