-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from whitehacker/main
Adjusted the where value in toolGetMapping()
- Loading branch information
Showing
14 changed files
with
166 additions
and
44 deletions.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,3 +6,7 @@ | |
^\.github$ | ||
^codecov\.yml$ | ||
^workflow$ | ||
^Makefile$ | ||
^.lintr$ | ||
^tests/.lintr$ | ||
^.*CITATION.cff$ |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
linters: lucode2::lintrRules() | ||
encoding: "UTF-8" |
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 |
---|---|---|
@@ -1,12 +1,28 @@ | ||
# testthat snapshots are machine-generated regression tests that | ||
# have to be preserved exactly as they are | ||
exclude: '^tests/testthat/_snaps/.*$' | ||
repos: | ||
- repo: https://github.com/pre-commit/pre-commit-hooks | ||
rev: v4.0.1 | ||
rev: v4.4.0 | ||
hooks: | ||
- id: check-case-conflict | ||
- id: check-json | ||
- id: check-yaml | ||
- id: check-merge-conflict | ||
- id: check-yaml | ||
- id: fix-byte-order-marker | ||
- id: end-of-file-fixer | ||
- id: check-added-large-files | ||
args: ['--maxkb=100'] | ||
- id: mixed-line-ending | ||
|
||
- repo: https://github.com/lorenzwalthert/precommit | ||
rev: v0.3.2.9013 | ||
hooks: | ||
- id: parsable-R | ||
- id: deps-in-desc | ||
args: [--allow_private_imports] | ||
- id: no-browser-statement | ||
- id: no-debug-statement | ||
- id: readme-rmd-rendered | ||
- id: use-tidy-description | ||
ci: | ||
autoupdate_schedule: quarterly |
This file was deleted.
Oops, something went wrong.
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,15 @@ | ||
cff-version: 1.2.0 | ||
message: If you use this software, please cite it using the metadata from this file. | ||
type: software | ||
title: 'mrtutorial: Tutorial Package For Madrat Package Library' | ||
version: 0.2.10 | ||
date-released: '2023-07-13' | ||
abstract: 'Example package of mr- world libraries, in conjunction with MAgPIE MADRat | ||
tutorial. For more information please see: https://github.com/magpiemodel/tutorials/tree/master/madrat | ||
.' | ||
authors: | ||
- family-names: Chen | ||
given-names: David Meng-Chuen | ||
email: [email protected] | ||
license: GPL-3.0 | ||
|
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 |
---|---|---|
@@ -1,28 +1,30 @@ | ||
Package: mrtutorial | ||
Type: Package | ||
Package: mrtutorial | ||
Title: Tutorial Package For Madrat Package Library | ||
Date: 2022-03-07 | ||
Version: 0.2.9 | ||
Version: 0.2.10 | ||
Date: 2023-07-13 | ||
Authors@R: | ||
person("David Meng-Chuen", "Chen", email = "[email protected]", role = c("aut","cre")) | ||
Description: Example package of mr- world libraries, in conjunction with MAgPIE MADRat tutorial. For more information please see: https://github.com/magpiemodel/tutorials/tree/master/madrat . | ||
person("David Meng-Chuen", "Chen", , "[email protected]", role = c("aut", "cre")) | ||
Description: Example package of mr- world libraries, in conjunction with | ||
MAgPIE MADRat tutorial. For more information please see: | ||
https://github.com/magpiemodel/tutorials/tree/master/madrat . | ||
License: GPL-3 | ||
Depends: | ||
R(>= 2.10.0), | ||
magclass(>= 3.17), | ||
madrat(>= 2.11.3) | ||
License: GPL-3 | ||
Encoding: UTF-8 | ||
LazyData: true | ||
Roxygen: list(markdown = TRUE) | ||
RoxygenNote: 7.1.2 | ||
R (>= 2.10.0), | ||
madrat (>= 2.11.3), | ||
magclass (>= 3.17) | ||
Imports: | ||
WDI, | ||
countrycode, | ||
dplyr, | ||
lucode2, | ||
reshape2, | ||
magpiesets, | ||
dplyr, | ||
tidyr, | ||
rlang | ||
reshape2, | ||
rlang, | ||
tidyr | ||
Suggests: | ||
covr | ||
Encoding: UTF-8 | ||
LazyData: true | ||
Roxygen: list(markdown = TRUE) | ||
RoxygenNote: 7.2.3 |
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,46 @@ | ||
.PHONY: help build check test lint lint-all format format-all install docs | ||
.DEFAULT_GOAL = help | ||
|
||
# extracts the help text and formats it nicely | ||
HELP_PARSING = 'm <- readLines("Makefile");\ | ||
m <- grep("\#\#", m, value=TRUE);\ | ||
command <- sub("^([^ ]*) *\#\#(.*)", "\\1", m);\ | ||
help <- sub("^([^ ]*) *\#\#(.*)", "\\2", m);\ | ||
cat(sprintf("%-8s%s", command, help), sep="\n")' | ||
|
||
help: ## Show this help. | ||
@Rscript -e $(HELP_PARSING) | ||
|
||
build: ## Build the package using lucode2::buildLibrary(). You can pass the | ||
## updateType with 'make build u=3' | ||
Rscript -e 'lucode2::buildLibrary(updateType = "$(u)")' | ||
|
||
check: ## Build documentation and vignettes, run testthat tests, | ||
## and check if code etiquette is followed using lucode2::check(). | ||
Rscript -e 'lucode2::check()' | ||
|
||
test: ## Run testthat tests | ||
Rscript -e 'devtools::test(show_report = TRUE)' | ||
|
||
lint: ## Check if code etiquette is followed using lucode2::lint(). | ||
## Only checks files you changed. | ||
Rscript -e 'lucode2::lint()' | ||
|
||
lint-all: ## Check if code etiquette is followed using lucode2::lint(). | ||
## Checks all files. | ||
Rscript -e 'lucode2::lint(".")' | ||
|
||
format: ## Apply auto-formatting to changed files and lint afterwards. | ||
Rscript -e 'lucode2::autoFormat()' | ||
|
||
format-all: ## Apply auto-formatting to all files and lint afterwards. | ||
Rscript -e 'lucode2::autoFormat(files=list.files("./R", full.names = TRUE, pattern = "\\.R"))' | ||
|
||
install: ## Install the package locally via devtools::install() after | ||
## generating NAMESPACE and docs (see docs target). | ||
Rscript -e 'roxygen2::roxygenize(); devtools::install(upgrade = "never")' | ||
|
||
docs: ## Generate the package documentation (man/*.Rd files) and | ||
## NAMESPACE via roxygen2::roxygenize(), view the generated | ||
## documentation with `?package::function`. | ||
Rscript -e 'roxygen2::roxygenize()' |
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,4 @@ | ||
# The package documentation is defined in this file. | ||
# You can get it via `library(<package>); ?<package>`. | ||
#' @docType package | ||
"_PACKAGE" |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,2 @@ | ||
linters: lucode2::lintrRules(allowUndesirable = TRUE) | ||
encoding: "UTF-8" |