Bump version

.Rbuildignore

@@ -21,3 +21,4 @@
 ^vignettes/.lintr$
 ^CRAN-SUBMISSION$
 ^Makefile$
+^.*CITATION.cff$

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '1936000'
+ValidationKey: '2147970'
 AutocreateReadme: no
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

.github/workflows/lucode2-check.yaml → .github/workflows/check.yaml

@@ -1,6 +1,6 @@
 # Run CI for R using https://eddelbuettel.github.io/r-ci/
 
-name: lucode2-check
+name: check
 
 on:
   push:
@@ -14,11 +14,11 @@ env:
   NO_BINARY_INSTALL_R_PACKAGES: 'c("madrat", "magclass", "citation", "gms", "goxygen", "GDPuc", "roxygen2")'
 
 jobs:
-  lucode2-check:
+  check:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Bootstrap
         run: |
@@ -57,10 +57,10 @@ jobs:
           cat /etc/R/Rprofile.site
 
       - name: Set up Pandoc
-        uses: r-lib/actions/setup-pandoc@v1
+        uses: r-lib/actions/setup-pandoc@v2
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
     -   id: mixed-line-ending
 
 -   repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.3.2.9007
+    rev: v0.3.2.9013
     hooks:
     -   id: parsable-R
     -   id: deps-in-desc

CITATION.cff

@@ -0,0 +1,19 @@
+cff-version: 1.2.0
+message: If you use this software, please cite it using the metadata from this file.
+type: software
+title: 'GDPuc: Easily Convert GDP Data'
+version: 0.11.0
+date-released: '2023-06-19'
+abstract: A function to convert GDP time series from one unit to another. All common
+  GDP units are included, i.e. current and constant local currency units, US$ via
+  market exchange rates and international dollars via purchasing power parities. Conversion
+  factors can easily be customized. Conversion at a regional/aggregated level is also
+  possible.
+authors:
+- family-names: Koch
+  given-names: Johannes
+  email: [email protected]
+license: GPL (>= 3)
+repository-code: https://github.com/pik-piam/GDPuc
+url: https://pik-piam.github.io/GDPuc/
+

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: GDPuc
 Title: Easily Convert GDP Data
-Version: 0.10.0
-Date: 2023-01-03
+Version: 0.11.0
+Date: 2023-06-19
 Authors@R:
     person("Johannes", "Koch", , "[email protected]", role = c("aut", "cre"))
 Description: A function to convert GDP time series from one unit to

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help build check test lint format
+.PHONY: help build check test lint lint-all format format-all install docs
 .DEFAULT_GOAL = help
 
 # extracts the help text and formats it nicely
@@ -11,18 +11,36 @@ HELP_PARSING = 'm <- readLines("Makefile");\
 help:           ## Show this help.
 	@Rscript -e $(HELP_PARSING)
 
-build:          ## Build the package using lucode2::buildLibrary()
-	Rscript -e 'lucode2::buildLibrary()'
+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()
+                ## 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()
+lint:           ## Check if code etiquette is followed using lucode2::lint().
+                ## Only checks files you changed.
 	Rscript -e 'lucode2::lint()'
 
-format:         ## Apply auto-formatting to changed files and lint afterwards
+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()'