Skip to content

Conversation

@sschmidt23
Copy link
Collaborator

Leaving as a draft for now, I think this is mostly done, but I need to make sure I don't have duplicate copies of files and such. This PR addresses several interrelated issues, namely
#238 (package_data files are now moved to src/rail/examples/ rather than top-level examples/)
#245 (I eliminated the various install options, base, all, etc..., so we how just have the one standard install)
#244 (already partially fixed by addition of RAILDIR, but going through and checking default file locations for GridSelection and SpecSelection to use RAILDIR and new file locations for defaults). BPZ and Delight changes will need to be made in rail_bpz and rail_delight separate from this PR.

For #245, in eliminating the other install options, I added sklearn and pzflow to the overall package requirements. As pzflow is also used by one of the estimators, and sklearn is pretty standard, this seems uncontroversial to me, but mentioning it here just in case.

Will assign reviewers once I finish file location checks and run this on a fresh install on my other computer.

@codecov
Copy link

codecov bot commented Sep 12, 2022

Codecov Report

Merging #250 (69b4c8b) into main (3bb255c) will not change coverage.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##              main      #250   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           35        35           
  Lines         2165      2147   -18     
=========================================
- Hits          2165      2147   -18     
Flag Coverage Δ
unittests 100.00% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/rail/core/__init__.py 100.00% <ø> (ø)
src/rail/core/common_params.py 100.00% <ø> (ø)
src/rail/core/data.py 100.00% <ø> (ø)
src/rail/core/stage.py 100.00% <ø> (ø)
src/rail/core/utilPhotometry.py 100.00% <ø> (ø)
src/rail/core/utilStages.py 100.00% <ø> (ø)
src/rail/core/utils.py 100.00% <ø> (ø)
src/rail/creation/degradation/__init__.py 100.00% <ø> (ø)
src/rail/creation/degradation/lsst_error_model.py 100.00% <ø> (ø)
src/rail/creation/degradation/quantityCut.py 100.00% <ø> (ø)
... and 27 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@sschmidt23
Copy link
Collaborator Author

Ok, I think this is ready now, I will have to make separate PRs for rail_bpz and rail_delight after this is approved, as the move will break a couple of default config file location conventions in those repos I believe.

A thing to check for reviewers: after you pip install RAIL, check the site-packages directory where the files are copied and make sure that examples, tests, etc... directories are not copied there outside of the RAIL package. This works correctly for me, but outside confirmation is always good.

@sschmidt23 sschmidt23 marked this pull request as ready for review September 12, 2022 22:43
Copy link
Collaborator

@eacharles eacharles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Installed it with pip install . and pip install -e ., ran unit tests, both worked. Made sure the installed files end up in the right place. Ran notebooks using the documentation scripts. everything looked good.

@sschmidt23 sschmidt23 merged commit a704fce into main Sep 12, 2022
@sschmidt23 sschmidt23 deleted the issue/238/reorganize branch September 12, 2022 23:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Simplify pip install options Paths to default files Stray installed directories

3 participants