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.

Sign up for GitHub

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

Jump to bottom

Release v1.5.0 #283

Merged
merged 265 commits into from
Apr 8, 2024
Merged

Release v1.5.0 #283

merged 265 commits into from
Apr 8, 2024

Conversation

bl-young
Copy link
Collaborator

Major updates

Other updates

jvendries and others added 30 commits June 17, 2022 14:46
@jvendries
Removed obsolete comments
e64076d
@jvendries
changed some test values in use input file for ease of reference and …
abedf3b 
…testing
@bl-young
add functions to obtain and process FBS for WIO
f62ea61
@bl-young
incorporate FBS into WIO code flow
6ed3129
@jvendries
-In includeUseWIO function: edited variable names for clarity
276e526 
-In includeMakeWIO function: added code to include WIO sectors in MakeTransactions
@jvendries
In WIOTest_make.csv, corrected commodity/industry names for several rows
e59438b
@jvendries
In WIOtest_Use.csv, changed example values for several rows for balan…
6f76c28 
…cing purposes
@jvendries
Added WIO values for UseValueAdded and FinalDemand model objects
a613f9e
@jvendries
added WIO elements to DomesticFullUse, model$Industry and model$Commo…
84a9cf3 
…dity, as well as Industry and CommodityOutput
@jvendries
Adjusted DomesticFinalDemand with WIO objects
950ea09 
Adjusted internationalTradeAdjustment dimensions to be consistent with number of WIO objects
@jvendries
In BuildModel.R, changed how the normalized make table (model$V_n) is…
684ae58 
… calculated depending on whether the modelType is "WIO"
@bl-young
update handling of make and use from FBS based on flowable
983ab70
@bl-young
update fbs data with code_loc
0f9c415
@bl-young
map NAICS from FBS to BEA
584ded0
@bl-young
add concrete specs
11d4239
@jvendries
In BuildModel.R, changed derivation of U_n for WIO models to use mode…
506f2e7 
…l$IndustryOutputs (i.e. Use table row sums)
@bl-young
aggregate use table df so no duplicates
83f604b
@jvendries
Merge branch 'WIO' of https://github.com/USEPA/useeior into WIO
3d8643b
@jvendries
Removed unneeded modifications for WIO in BuildModel.R
df36dd0
@bl-young
cleanup
f785e3e
@bl-young
fix typo
0b44fef
@jvendries
added function to check for balance in waste and recycling sectors
546862b
@jvendries
code clean up
8c5ca00 
Merge branch 'WIO' of https://github.com/USEPA/useeior into WIO

# Conflicts:
#	R/WIOFunctions.R
@jvendries
code clean up
4044918
@bl-young
pass configpaths for WIO models
8904dac
@jvendries
added configpaths to disaggregateSetup call within getWIOSpecs
2c1c858
@jvendries
Merge branch 'WIO' of https://github.com/USEPA/useeior into WIO
0bf3013
@bl-young
add WAGE and TAX unique indicators from VADD
2233546
@bl-young
add flow mapping for REI flows
8d41ca0
@jvendries
edits to checkWIOBalance function to check for the case where some, b…
48d3879 
…ut not all, WIO ectors are properly defined
bl-young and others added 25 commits March 11, 2024 17:22
@bl-young
move electricity files to tests
8a6fe39
@bl-young
model spec 2.1 -> 3.0
6dae0a5
@bl-young
update action w/ changed model spec name
63e1fa0
@bl-young
Merge pull request #282 from USEPA/spec_dir_refactor
88987df 
Refactor hosted model specs
@bl-young
Merge branch 'develop' into WIO
a43574e
@bl-young
add NGMUIO to test model
4a33eed
@bl-young
look for full filename not partial
c4e0fd7
@bl-young
Merge pull request #268 from USEPA/WIO
b1020d1 
Updates for HIO and WIO
@bl-young
Merge branch 'develop' into 2017MakeUse
b50c303 
# Conflicts:
#	.github/workflows/R-CMD-check.yaml
#	R/UtilityFunctions.R
@bl-young
add USEEIOv3.0 to tests
eac3a62
@bl-young
separate access to crosswalk as new function
0f09846
@bl-young
fix error in creating summary CPI table
ceac7a4
@bl-young
add missing 2017 summary schema file, copy of 2012 file
c1a2445
@bl-young
Merge pull request #280 from USEPA/2017MakeUse
4317133 
Updates to support BEA 2017 Schema data release
@bl-young
add README to tests
b6da158
@bl-young
update documentation of new model types #265
8f26c8f
@bl-young
make links relative
242530d
@bl-young
make links relative
f303b78
@bl-young
remove commented out code and reduce line lengths
04c32f7
@bl-young
bump to checkout@v4
62afcd5
Add more detail to MUIO and WIO file specification descriptions.
97ccbd4
Merge branch 'develop' of https://github.com/USEPA/useeior into develop
8def2e9
@bl-young
🔖 bump to v1.5.0
d578747
@github-actions
Update BEA data
bb9954f
@github-actions
Update annual BEA data
d6a8d07
@bl-young bl-young requested a review from WesIngwersen March 22, 2024 01:54
@bl-young
Copy link
Collaborator Author

bl-young commented Apr 8, 2024

I can't seem to find a way around this current mac bug with arrow (see https://github.com/USEPA/USEEIO_team/discussions/98#discussioncomment-8856003). There are work arounds for mac install (e.g. apache/arrow#40667 (comment)), but none that seem to work within the github actions.

@bl-young bl-young merged commit aa5f438 into master Apr 8, 2024
3 checks passed
@bl-young bl-young deleted the release_v1.5.0 branch April 8, 2024 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WesIngwersen WesIngwersen Awaiting requested review from WesIngwersen

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bl-young @WesIngwersen @jvendries @a-w-beck