Changeset 18da4a8 in sasview
- Timestamp:
- Feb 22, 2017 7:45:47 PM (8 years ago)
- 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 19:45:47)
- git-committer:
- GitHub <noreply@…> (02/22/17 19:45:47)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
setup.py
r18e7309 r1e13b53 206 206 ) 207 207 208 209 208 # sas.sascalc.pr 210 209 srcdir = os.path.join("src", "sas", "sascalc", "pr", "c_extensions") … … 229 228 ) ) 230 229 230 #sas.sascalc.corfunc 231 package_dir["sas.sascalc.corfunc"] = os.path.join("src", "sas", "sascalc", "corfunc") 232 packages.extend(["sas.sascalc.corfunc"]) 233 231 234 # sas.sascalc.fit 232 235 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") 238 241 packages.extend(["sas.sasgui.perspectives","sas.sasgui.perspectives.pr"]) 239 package_data["sas.sasgui.perspectives.pr"] = [' images/*']242 package_data["sas.sasgui.perspectives.pr"] = ['media/*'] 240 243 241 244 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"]) 251 254 package_data['sas.sasgui.perspectives.calculator'] = ['images/*', 'media/*'] 255 256 package_dir["sas.sasgui.perspectives.corfunc"] = os.path.join("src", "sas", "sasgui", "perspectives", "corfunc") 257 packages.extend(["sas.sasgui.perspectives.corfunc"]) 258 package_data['sas.sasgui.perspectives.corfunc'] = ['media/*'] 259 260 package_dir["sas.sasgui.perspectives.file_converter"] = os.path.join("src", "sas", "sasgui", "perspectives", "file_converter") 261 packages.extend(["sas.sasgui.perspectives.file_converter"]) 262 package_data['sas.sasgui.perspectives.file_converter'] = ['media/*'] 252 263 253 264 # Data util
Note: See TracChangeset
for help on using the changeset viewer.