Skip to content

Prepare next release#17

Open
hsonne wants to merge 55 commits intomasterfrom
dev
Open

Prepare next release#17
hsonne wants to merge 55 commits intomasterfrom
dev

Conversation

@hsonne
Copy link
Copy Markdown
Member

@hsonne hsonne commented Jan 6, 2024 •
edited by mrustl
Loading

This change is Reviewable

hsonne and others added 30 commits September 5, 2023 18:42
@hsonne
Indicate development version
6ae75cc
@hsonne
Improve indentation
0b7b58c
@hsonne
Use selectColumns(), add argument "method_col"
fb57971
@hsonne
Consider column name passed as argument
3642a7b
@hsonne
Name list elements according to method_col
5b7c60a 
and use stats::setNames() to shorten by 1 line
@hsonne
Use lapply() and simplify variable name
ca07fe1 
(lci_methods -> methods)
@hsonne
Start adding support for json files as input
3b44e1d
@hsonne
Fix issues reported by R CMD check
9ee4436
@hsonne
Provide the old format
825470c 
so that the post-processing can remain
@hsonne
Document argument "method_col"
0cb62e2
@hsonne
Document and export import_rawdata_json()
cdfd048
@hsonne
Fix error in documentation
9c5b3ff
@hsonne
Use arrange() instead of deprecated arrange_()
712b31d
@hsonne
Merge pull request #15 from KWB-R/add-json-import
254df97 
Start adding support for json files as input
@hsonne
Remove unused function flatten_all()
80e536e
@hsonne
Move general functions to utils.R
b271049
@hsonne
Remove unused function flatten()
c6cdb8a
@hsonne
Move to_tables() and related to its own file
6b4ba96
@hsonne
Move functions to utils.R, reorder by name
69a7b93
@hsonne
Remove unused flatten_list_of_unnamed_elements()
0f24d9e
@hsonne
Move two functions to helpers.R, reorder funcs
e9e98e6
@hsonne
Add general flatten() function, try to use it
9ad4d6e 
TODO: check if I can use this more general
function to simplify or shorten the existing
approach.
Merge branch 'dev' into add-json-import
1e2ab51
@hsonne
Document better what could be improved
41be702
@hsonne
Add argument "sep", pass args to recursive call
17b49d0
@hsonne
Handle different cases when row-binding
6df4e45 
Keep the name of the original list elements
in a column if there was more than one element
from which flattened data frames are joined
@hsonne
Use flatten(), compare with original results
7bf5e85
@hsonne
Remove old processing and code for comparison
8f0f012
@hsonne
Try to use new flatten() in to_product()
b914b8e
@hsonne
Use flatten() on a higher level, check identity
d00f819
hsonne and others added 22 commits January 5, 2024 16:57
@hsonne
Improve formatting
9705817
@hsonne
Add split_by_columns()
95d9783
@hsonne
Rename "result" to "result_tables"
7b188ba
@hsonne
Fix bug in pipe
7f1bcc3
@hsonne
Load files from Lea
ff9a9aa
@hsonne
Update Rd file
bfe43cd
@hsonne
Add import_json_files_to_excel()
1ed8719
@hsonne
Omit intermediate variable "base_name"
1977a5e
@hsonne
Merge pull request #16 from KWB-R/add-json-import
8a8f8a9 
Add json import
@hsonne
Clean stop_on_differing_names()
95bc422
@hsonne
Create Excel file within input directory
13db857 
(by default)
@hsonne
Import kwb.utils::stopFormatted()
604a94b
@hsonne
Add argument "overwrite"
4dab708
@hsonne
Name sheets "m01", "m02", ...
3731059
@hsonne
Add argument "expand" for same rows in sheets
0dad4c2
@hsonne
Reimplement the "expanding" of sheets
2dd80ab
@hsonne
Update Rd file
90921df
@hsonne
Add test call
105d70e
@hsonne
Fix 🐛 in expand_to_all_key_combinations()
14fff20
@hsonne
Add comment with installation command
1856d46
@hsonne
Merge pull request #18 from KWB-R/expand
cb61911 
Add expand_to_all_key_combinations()
@hsonne
Install from "dev" after merging "expand"
9d7182d
@hsonne hsonne requested a review from mrustl March 18, 2024 18:19
@mrustl
Copy link
Copy Markdown
Member

mrustl commented Mar 21, 2024

DESCRIPTION line 3 at r1 (raw file):

Package: kwb.umberto
Title: R package supporting UMERTO LCA at KWB
Version: 0.2.0.9000

Please bump version number before moving to "master". In addition also update NEWS.md if not already done!

@mrustl
Copy link
Copy Markdown
Member

mrustl commented Mar 21, 2024

R/import_json_files_to_excel.R line 15 at r1 (raw file):

#'   possible combinations of values in these key columns are then given in each
#'   sheet even though there are no values for these key value combinations.
#'   Default: \code{c("indicator", "process", "place", "exchange")}

does not fit with number of values for "expand_keys" in function

@mrustl
Copy link
Copy Markdown
Member

mrustl commented Mar 21, 2024

R/import_rawdata_json.R line 5 at r1 (raw file):

  #remotes::install_github("kwb-r/kwb.umberto@dev")
  
  json_dir <- "~/../Downloads/S/support/fabian/R-Umberto/Umberto11"

Add this part as new "vignette" for new UMBERTO version

mrustl
mrustl reviewed Mar 21, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@mrustl mrustl left a comment

Choose a reason for hiding this comment

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

Reviewed 14 of 16 files at r1, all commit messages.
Reviewable status: 14 of 16 files reviewed, 3 unresolved discussions (waiting on @hsonne)

mrustl
mrustl approved these changes Mar 21, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@mrustl mrustl left a comment

Choose a reason for hiding this comment

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

:lgtm: minor comments for improvement ;-)

Reviewable status: 14 of 16 files reviewed, 3 unresolved discussions (waiting on @hsonne)

mrustl
mrustl approved these changes Mar 21, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@mrustl mrustl left a comment

Choose a reason for hiding this comment

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

only minor comments for improvement ;-)

Reviewed 2 of 16 files at r1.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @hsonne)

@mrustl
Copy link
Copy Markdown
Member

mrustl commented Mar 21, 2024

  • Add new vignette for new UMBERTO import
  • Bump version of R package for release and update NEWS.md

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrustl mrustl mrustl approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@hsonne @mrustl