-
Notifications
You must be signed in to change notification settings - Fork 41
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use sasdata package in place of sas.sascalc.dataloader #2141
Conversation
…as.sascalc.(dataloader|data_util|file_converter)
…s in sasdata package
…er and point to new location of manipulations.py
…py and fix related package issue
…lude missing dependencies to workflows
I expect this will have quite a lot of collisions with #2145 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Functionality test on W10/x64 (once I'd figured out how to test this PR!).
Tested loading individual and multiple (ctrl-click) 1D files of different types from 'Load data' button. OK.
Tested File > Load Data File(s) with 1D data. OK.
Tested File > Load Data Folder with 1D data. OK.
In some instances the following appeared in the Log Explorer:
WARNING: ascii_reader: could not load file
It would be more helpful if the filename that threw the warning was included.
Tested loading individual and multiple (ctrl-click) 2D files of different types from 'Load data' button. OK.
Tested File > Load Data File(s) with 2D data. OK.
Tested File > Load Data Folder with 2D data. OK.
Rejects coordinate and convertible files as it should with a sensible message in the Log Explorer. OK.
Also rejects image files (which should only load through the Image Viewer) but populates the Log Explorer with a whole lot of junk! It would be nice if this could be sanitised.
Image Viewer loads image files. OK.
Generic Scattering Calculator loaded coordinate files. OK.
Workspaces loaded in the Data Operation tool. OK.
So in functionality terms this PR seems fine (hence I'm approving), but a little tidying up on the messaging would be nice.
Need to prioritize this PR due to the number of changes that might affect other work. |
Seems to work with the pycharm workflow I have |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've been wondering where sasdata
is included in the installer file and couldn't find it. Interestingly sasdata.__file__
run from the shell returns:
/Volumes/SasView5/SasView5.app/Contents/MacOS/sasdata/__init__.pyc
, which doesn't exist.
It seems to work, so it is fine. It is just puzzling how it is imported and whether we need to anything for pyinstaller (like we did for sasmodels) to make sure is always running.
Otherwise looks good.
Looks and behaves good on Windows. |
Yes, I was thinking the same but shouldn't that produce a folder/file in the installer? On Mac I would expect some trace of it in: |
Oh, you mean the installed binary. Then it probably got compiled in into the executable? All .py files should be compiled in, but sasmodels source is also explicitly added in the .spec file. sasdata is not |
Should I add it to the spec? It wouldn't take much to make the change. |
# Conflicts: # src/examples/test_panel2D.py
If the |
This PR replaces the
sas.sascalc.dataloader
subpackage with the stand-alone sasdata package. This is a step toward a complete separation between the calculation and GUI.All data import/export capabilities, including unit tests, are now held within the sasdata package and are removed from sasview in this PR. Github workflows are updated to build and bundle the package into the installers.
This is a parallel PR to sasmodels 517. This PR also includes all work done in #2139.