-
Notifications
You must be signed in to change notification settings - Fork 16
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
secondary compartment/context assignment #106
Merged
Merged
Changes from 13 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
0ffdb96
Update setup.py
a-w-beck 918d840
Merge branch 'release_1.0.3' into urban_rural_classify
bl-young b793cdf
New assign_secondary_context handler function in globals for esupy.co…
a-w-beck 1ea0b05
Ammended remainder of inplace=True pandas method calls
a-w-beck 26e9699
Reorganized secondary context/compartment functions s.t. assignment h…
a-w-beck f2568cf
Migration of globals.assign_secondary_context() down into esupy.conte…
a-w-beck e36902c
remove unneeded esupy pip VCS install line
a-w-beck 84f051c
adjust validation to include compartment in some cases
bl-young 50ce8d6
fix missing cmpt_urb
bl-young 94e800b
remove extra parameter
bl-young 91ad470
Merge branch 'master' into urban_rural_classify
a-w-beck 7407ceb
Update README.md
a-w-beck f738437
Corrected flow control :bug: preventing release height concatenation …
a-w-beck 05be46d
Set concat_compartment()'s has_geo_pkgs arg as True in TRI.py within …
a-w-beck 00c8006
Merge branch 'develop' into urban_rural_classify
bl-young ed74501
Rename column cmpt_urb --> UrbanRural; allow urban/rural assignment f…
a-w-beck 74cbb7e
add `UrbanRural` to format specs
bl-young 84cb0fe
return applied parameters when generating inventories, and add to met…
bl-young 3c8128b
add `ready_for_review` for revised PRs
bl-young 7e7cf1d
fix `FutureWarning`
bl-young 1b06206
Temporarily set all compartments to the primary compartment until ove…
bl-young File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
name: stewi_2ndry_ctxt | ||
channels: | ||
- defaults | ||
dependencies: | ||
- python=3.9.7 | ||
- pip=21.2.4 # must specify else conda returns warning | ||
- numpy=1.21.2 | ||
- pandas=1.3.4 | ||
- geopandas=0.9.0 | ||
- shapely=1.7.1 | ||
- requests=2.26.0 | ||
- appdirs=1.4.4 | ||
#- pytest=6.2.4 | ||
- spyder | ||
|
||
- pip: | ||
- pyarrow==6.0.1 # causes error if installed via conda default channel "OSError: NotImplemented: Support for codec 'snappy' not built" | ||
- requests_ftp==0.3.1 | ||
- "--editable=git+https://github.com/USEPA/standardizedinventories.git@urban_rural_classify#egg=StEWI" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
we'll need to remember to update this to develop or master