Changeset 759a8ab in sasview for setup.py

Timestamp:

Aug 29, 2017 5:30:45 PM (7 years ago)

Author:

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

Children:

25a42f99

Parents:

7c64911 (diff), f001bc9 (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 ticket-887-reorg

File:

• setup.py (modified) (1 diff)

setup.py

@@ -224 +224 @@
 package_dir["sas.sascalc.dataloader"] = os.path.join(
     "src", "sas", "sascalc", "dataloader")
-package_data["sas.sascalc.dataloader.readers"] = [
-    'defaults.json', 'schema/*.xsd']
+package_data["sas.sascalc.dataloader.readers"] = ['schema/*.xsd']
 packages.extend(["sas.sascalc.dataloader", "sas.sascalc.dataloader.readers",
                  "sas.sascalc.dataloader.readers.schema"])