Skip to content
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

Fix troute-nwm package setup.cfg #603

Merged
merged 1 commit into from
Feb 2, 2023
Merged

Conversation

hellkite500
Copy link
Contributor

Make sure the setup.cfg knows how to properly find the actual package under the src dir. Otherwise, a standard install (pip install troute-nwm/) won't actually install the module source required (-e works/ed cause it just created a link to the src dir, but for actual packaging, it doesn't bundle the package code without this in the config.

For reference, check out this useful reference on src/ layouts

Make sure the setup.cfg knows how to properly find the actual package under the `src` dir.  Otherwise, a standard install (`pip install troute-nwm/`) won't actually install the module source required (`-e` works/ed cause it just created a link to the src dir, but for actual packaging, it doesn't bundle the package code without this in the config.

For reference, check out [this useful reference on src/ layouts](https://setuptools.pypa.io/en/latest/userguide/declarative_config.html#using-a-src-layout)
@shorvath-noaa shorvath-noaa merged commit 4f13af1 into master Feb 2, 2023
@shorvath-noaa shorvath-noaa deleted the hellkite500-patch-1 branch February 2, 2023 21:19
shorvath-noaa added a commit that referenced this pull request Feb 16, 2023
* initial commit

* updated Abstract and HyFeatures network objects to use new functions

* bug fixes to get hyfeatures to run properly

* updates to NHDNetwork and functions in AbstractNetwork

* moved renaming param_df column into individual networks, removed cols from input argument for AbstractNetwork

* move renaming dataframe columns and terminal codes/connections creation into read_geo_file function for HyFeatures

* move functions from ..._preprocess.py files into the network objects as inherent functions

* fixed errors in data_assimilation.update() function

* t-route on larger hyfeature domain with hybrid routing (#602)

* t-route on larger hyfeature domain with hybrid routing

* remove debug line

Co-authored-by: Dong Kim <donghakim@cheyenne4.cheyenne.ucar.edu>

* add 'RoutingScheme' subclass of AbstractNetwork to set MC/diffusive related variables

* bug fixes to get test HYfeatures with MC only run working

* move build_qlateral_array function from AbstractNetwork to individual networks

* bug fixes to get NHDNetwork working with new configuration

* modified routing classes to be separate from network classes

* edited names of routing objects, consolidated inputs to nwm_route into fewer inputs

* edits to diffusive routing

* temporary fix for writing CHRTOUT files in serial rather than parallel

* minor updates to previous push

* Delete RoutingScheme.py

* Delete nhd_preprocess.py

* Delete hyfeature_preprocess.py

* more updates to address comments above

* deleted files

* Fix troute-nwm package setup.cfg (#603)

Make sure the setup.cfg knows how to properly find the actual package under the `src` dir.  Otherwise, a standard install (`pip install troute-nwm/`) won't actually install the module source required (`-e` works/ed cause it just created a link to the src dir, but for actual packaging, it doesn't bundle the package code without this in the config.

For reference, check out [this useful reference on src/ layouts](https://setuptools.pypa.io/en/latest/userguide/declarative_config.html#using-a-src-layout)

* removed loading nhd_preprocess.py as this file was removed

* reverse changes to compute_nhd_routing_v02 input arguments

* edit to work with redesigned initial_warmstate_preprocess function

* move build_forcing_sets() to AbstractNetwork. abstractnetwork_preprocess.py is no longer needed

* Delete abstractnetwork_preprocess.py

* initial commit

* updated Abstract and HyFeatures network objects to use new functions

* bug fixes to get hyfeatures to run properly

* updates to NHDNetwork and functions in AbstractNetwork

* moved renaming param_df column into individual networks, removed cols from input argument for AbstractNetwork

* move renaming dataframe columns and terminal codes/connections creation into read_geo_file function for HyFeatures

* move functions from ..._preprocess.py files into the network objects as inherent functions

* fixed errors in data_assimilation.update() function

* add 'RoutingScheme' subclass of AbstractNetwork to set MC/diffusive related variables

* bug fixes to get test HYfeatures with MC only run working

* move build_qlateral_array function from AbstractNetwork to individual networks

* bug fixes to get NHDNetwork working with new configuration

* modified routing classes to be separate from network classes

* edited names of routing objects, consolidated inputs to nwm_route into fewer inputs

* edits to diffusive routing

* temporary fix for writing CHRTOUT files in serial rather than parallel

* minor updates to previous push

* Delete RoutingScheme.py

* Delete nhd_preprocess.py

* Delete hyfeature_preprocess.py

* more updates to address comments above

* removed loading nhd_preprocess.py as this file was removed

* reverse changes to compute_nhd_routing_v02 input arguments

* edit to work with redesigned initial_warmstate_preprocess function

* move build_forcing_sets() to AbstractNetwork. abstractnetwork_preprocess.py is no longer needed

---------

Co-authored-by: kumdonoaa <54687070+kumdonoaa@users.noreply.github.com>
Co-authored-by: Dong Kim <donghakim@cheyenne4.cheyenne.ucar.edu>
Co-authored-by: Nels <nels.frazier@noaa.gov>
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.

2 participants