From 245b999f436e062180c924cb22fc22ed44bf3b0c Mon Sep 17 00:00:00 2001 From: Johannes Koch Date: Mon, 19 Jun 2023 16:22:16 +0200 Subject: [PATCH] Bump version --- .Rbuildignore | 1 + .buildlibrary | 2 +- .../{lucode2-check.yaml => check.yaml} | 10 +++---- .pre-commit-config.yaml | 2 +- .zenodo.json | 10 ------- CITATION.cff | 19 ++++++++++++ DESCRIPTION | 4 +-- Makefile | 30 +++++++++++++++---- 8 files changed, 53 insertions(+), 25 deletions(-) rename .github/workflows/{lucode2-check.yaml => check.yaml} (95%) delete mode 100644 .zenodo.json create mode 100644 CITATION.cff diff --git a/.Rbuildignore b/.Rbuildignore index ea4a5f7..258c16d 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -21,3 +21,4 @@ ^vignettes/.lintr$ ^CRAN-SUBMISSION$ ^Makefile$ +^.*CITATION.cff$ diff --git a/.buildlibrary b/.buildlibrary index db87577..ab13ba1 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '1936000' +ValidationKey: '2147970' AutocreateReadme: no AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/.github/workflows/lucode2-check.yaml b/.github/workflows/check.yaml similarity index 95% rename from .github/workflows/lucode2-check.yaml rename to .github/workflows/check.yaml index 7acf601..fcd7136 100644 --- a/.github/workflows/lucode2-check.yaml +++ b/.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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d9409d2..9c3b069 100644 --- a/.pre-commit-config.yaml +++ b/.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 diff --git a/.zenodo.json b/.zenodo.json deleted file mode 100644 index ca06725..0000000 --- a/.zenodo.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "title": "GDPuc: Easily Convert GDP Data", - "version": "0.10.0", - "description": "

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": [ - { - "name": "Koch, Johannes" - } - ] -} diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 0000000..3687faf --- /dev/null +++ b/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: jokoch@pik-potsdam.de +license: GPL (>= 3) +repository-code: https://github.com/pik-piam/GDPuc +url: https://pik-piam.github.io/GDPuc/ + diff --git a/DESCRIPTION b/DESCRIPTION index 00886ba..8b0f1cf 100644 --- a/DESCRIPTION +++ b/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", , "jokoch@pik-potsdam.de", role = c("aut", "cre")) Description: A function to convert GDP time series from one unit to diff --git a/Makefile b/Makefile index ded3266..38e857f 100644 --- a/Makefile +++ b/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()'