Changeset 18da4a8 in sasview

Timestamp:

Feb 22, 2017 5:45:47 PM (7 years ago)

Author:

GitHub <noreply@…>

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

cb05bfd

Parents:

2510b9b (diff), 1e13b53 (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.

git-author:

Paul Kienzle <pkienzle@…> (02/22/17 17:45:47)

git-committer:

GitHub <noreply@…> (02/22/17 17:45:47)

Message:

Merge pull request #35 from SasView?/ticket-855

ticket-855: Modify setup.py to include file_converter and corfunc in Jenkins build. Fixes #855

File:

• setup.py (modified) (4 diffs)

setup.py

@@ -206 +206 @@
 )
 
-
 # sas.sascalc.pr
 srcdir  = os.path.join("src", "sas", "sascalc", "pr", "c_extensions")
@@ -229 +228 @@
                               ) )
 
+#sas.sascalc.corfunc
+package_dir["sas.sascalc.corfunc"] = os.path.join("src", "sas", "sascalc", "corfunc")
+packages.extend(["sas.sascalc.corfunc"])
+
 # sas.sascalc.fit
 package_dir["sas.sascalc.fit"] = os.path.join("src", "sas", "sascalc", "fit")
@@ -237 +240 @@
 package_dir["sas.sasgui.perspectives.pr"] = os.path.join("src", "sas", "sasgui", "perspectives", "pr")
 packages.extend(["sas.sasgui.perspectives","sas.sasgui.perspectives.pr"])
-package_data["sas.sasgui.perspectives.pr"] = ['images/*']
+package_data["sas.sasgui.perspectives.pr"] = ['media/*']
 
 package_dir["sas.sasgui.perspectives.invariant"] = os.path.join("src", "sas", "sasgui", "perspectives", "invariant")
@@ -250 +253 @@
 packages.extend(["sas.sasgui.perspectives", "sas.sasgui.perspectives.calculator"])
 package_data['sas.sasgui.perspectives.calculator'] = ['images/*', 'media/*']
+
+package_dir["sas.sasgui.perspectives.corfunc"] = os.path.join("src", "sas", "sasgui", "perspectives", "corfunc")
+packages.extend(["sas.sasgui.perspectives.corfunc"])
+package_data['sas.sasgui.perspectives.corfunc'] = ['media/*']
+
+package_dir["sas.sasgui.perspectives.file_converter"] = os.path.join("src", "sas", "sasgui", "perspectives", "file_converter")
+packages.extend(["sas.sasgui.perspectives.file_converter"])
+package_data['sas.sasgui.perspectives.file_converter'] = ['media/*']
 
 # Data util