Changeset 27109e5 in sasview


Ignore:
Timestamp:
Mar 27, 2017 10:24:57 AM (8 years ago)
Author:
krzywon
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:
8434365
Parents:
9146ed9
git-author:
Jeff Krzywon <krzywon@…> (03/27/17 10:24:57)
git-committer:
krzywon <krzywon@…> (03/27/17 10:24:57)
Message:

Setup includes all folders in the test data directory and pagestate imports sasview properly.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • setup.py

    r1e13b53 r27109e5  
    315315                               'test/1d_data/*', 
    316316                               'test/2d_data/*', 
     317                               'test/convertible_files/*', 
     318                               'test/coordinate_data/*', 
     319                               'test/image_data/*', 
     320                               'test/media/*', 
     321                               'test/other_files/*', 
    317322                               'test/save_states/*', 
    318                                'test/upcoming_formats/*', 
    319                                  'default_categories.json'] 
     323                               'test/sesans_data/*' 
     324                               ] 
    320325packages.append("sas.sasview") 
    321326 
  • src/sas/sasgui/perspectives/fitting/pagestate.py

    rd5aff7f r27109e5  
    819819 
    820820        attr = newdoc.createAttribute("version") 
    821         import sasview 
     821        from sas import sasview 
    822822        attr.nodeValue = sasview.__version__ 
    823823        # attr.nodeValue = '1.0' 
Note: See TracChangeset for help on using the changeset viewer.