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

Update param filenames #32

Merged
merged 10 commits into from
Nov 14, 2024
Merged

Update param filenames #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
26f507b
rename param files
AlexAxthelm Nov 7, 2024
7aeb35f
Update references to new filenames
AlexAxthelm Nov 7, 2024
b94b57e
Use dev branch of package
AlexAxthelm Nov 7, 2024
7b0e7c5
Increment version number to 0.0.0.9007
AlexAxthelm Nov 7, 2024
54c41cc
remove list of explicit inheritence files
AlexAxthelm Nov 7, 2024
4d3b6e9
use `main` dependency
AlexAxthelm Nov 13, 2024
341c47c
Increment version number to 0.0.0.9008
AlexAxthelm Nov 13, 2024
368db61
Merge branch 'main' into update-param-filenames
AlexAxthelm Nov 13, 2024
6c0b32c
force portfolio/files to be an array
AlexAxthelm Nov 13, 2024
ab24161
Increment version number to 0.0.0.9008
AlexAxthelm Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: workflow.pacta.report
Title: Reporting functionality for PACTA
Version: 0.0.0.9007
Version: 0.0.0.9008
Authors@R:
c(person(given = "Alex",
family = "Axthelm",
Expand Down
2 changes: 1 addition & 1 deletion inst/extdata/parameters/GENERAL.json → inst/extdata/parameters/report_GENERAL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"projectCode": "GENERAL",
"projectReportName": "general"
},
"inherit": "default"
"inherit": "report_default"
}
2 changes: 1 addition & 1 deletion inst/extdata/parameters/GENERAL_2022Q4.json → ...ata/parameters/report_GENERAL_2022Q4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"scenarioOther": "GECO2022_1.5C",
"selectScenario": "WEO2022_NZE_2050"
},
"inherit": "GENERAL"
"inherit": "report_GENERAL"
}

2 changes: 1 addition & 1 deletion inst/extdata/parameters/GENERAL_2023Q4.json → ...ata/parameters/report_GENERAL_2023Q4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"scenarioOther": "GECO2022_1.5C",
"selectScenario": "WEO2022_NZE_2050"
},
"inherit": "GENERAL"
"inherit": "report_GENERAL"
}

0 inst/extdata/parameters/default.json → inst/extdata/parameters/report_default.json
View file
Open in desktop
File renamed without changes.
8 changes: 1 addition & 7 deletions inst/extdata/schema/rawParameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,7 @@
},
"inherit": {
"type": "string",
"description": "Path to a file with inheritance information.",
"enum": [
"GENERAL",
"GENERAL_2022Q4",
"GENERAL_2023Q4",
"default"
]
AlexAxthelm marked this conversation as resolved.
Show resolved Hide resolved
"description": "Path to a file with inheritance information."
}
},
"anyOf": [
Expand Down
3 changes: 2 additions & 1 deletion inst/extdata/scripts/run_pacta_report.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ params <- pacta.workflow.utils::parse_raw_params(
raw_schema_file = system.file(
"extdata", "schema", "rawParameters.json",
package = "workflow.pacta.report"
)
),
force_array = c("portfolio", "files")
AlexAxthelm marked this conversation as resolved.
Show resolved Hide resolved
)

manifest_info <- workflow.pacta.report:::run_pacta_reporting_process(
Expand Down
2 changes: 1 addition & 1 deletion tests/config/default_2022Q4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"default_portfolio.csv"
]
},
"inherit": "GENERAL_2022Q4"
"inherit": "report_GENERAL_2022Q4"
}
}
2 changes: 1 addition & 1 deletion tests/config/default_2023Q4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"default_portfolio.csv"
]
},
"inherit": "GENERAL_2023Q4"
"inherit": "report_GENERAL_2023Q4"
}
}