Bump version

.Rbuildignore

@@ -20,3 +20,4 @@
 ^tests/.lintr$
 ^vignettes/.lintr$
 ^CRAN-SUBMISSION$
+^Makefile$

.buildlibrary

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

.github/workflows/lucode2-check.yaml

@@ -28,6 +28,7 @@ jobs:
           curl -OLs https://eddelbuettel.github.io/r-ci/run.sh
           chmod 0755 run.sh
           ./run.sh bootstrap
+          rm -f bspm_*.tar.gz
 
       - name: Enable r-universe repo, modify bspm integration
         run: |
@@ -48,26 +49,29 @@ jobs:
                 pkgs <- c(bspm::install_sys(pkgs[!pkgs %%in%% noBinaryInstallRPackages]),
                           pkgs[pkgs %%in%% noBinaryInstallRPackages])
               }
+              type <- "source"
             })
             trace(utils::install.packages, expr, print = FALSE)
           })
           ' "$NO_BINARY_INSTALL_R_PACKAGES" | sudo tee --append /etc/R/Rprofile.site >/dev/null
           cat /etc/R/Rprofile.site
 
-      - uses: r-lib/actions/setup-pandoc@v1
+      - name: Set up Pandoc
+        uses: r-lib/actions/setup-pandoc@v1
 
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
           python-version: 3.9
 
       - name: Cache R libraries
+        if: ${{ !env.ACT }} # skip when running locally via nektos/act
         uses: pat-s/always-upload-cache@v3
         with:
           path: /usr/local/lib/R/
-          key: ${{ runner.os }}-usr-local-lib-R-${{ hashFiles('DESCRIPTION') }}
+          key: 3-${{ runner.os }}-usr-local-lib-R-${{ hashFiles('DESCRIPTION') }}
           restore-keys: |
-            ${{ runner.os }}-usr-local-lib-R-
+            3-${{ runner.os }}-usr-local-lib-R-
 
       - name: Restore R library permissions
         run: |
@@ -77,7 +81,8 @@ jobs:
         run: |
           ./run.sh install_aptget libhdf5-dev libharfbuzz-dev libfribidi-dev
           ./run.sh install_all
-          ./run.sh install_r lucode2 covr rstudioapi
+          ./run.sh install_r_binary covr rstudioapi
+          ./run.sh install_r lucode2
 
       - name: Install python dependencies if applicable
         run: |

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 exclude: '^tests/testthat/_snaps/.*$'
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
     -   id: check-case-conflict
     -   id: check-json
@@ -15,7 +15,7 @@ repos:
     -   id: mixed-line-ending
 
 -   repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.3.2.9001
+    rev: v0.3.2.9007
     hooks:
     -   id: parsable-R
     -   id: deps-in-desc

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "GDPuc: Easily Convert GDP Data",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "description": "<p>A function to convert GDP time series from one unit to\n    another.  All common GDP units are included, i.e. current and constant\n    local currency units, US$ via market exchange rates and international\n    dollars via purchasing power parities. Conversion factors can easily\n    be customized.  Conversion at a regional/aggregated level is also\n    possible.<\/p>",
   "creators": [
     {

DESCRIPTION

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

Makefile

@@ -0,0 +1,28 @@
+.PHONY: help build check test lint format
+.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()
+	Rscript -e 'lucode2::buildLibrary()'
+
+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()
+	Rscript -e 'lucode2::lint()'
+
+format:         ## Apply auto-formatting to changed files and lint afterwards
+	Rscript -e 'lucode2::autoFormat()'