diff --git a/.buildlibrary b/.buildlibrary index adff929..894cb03 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '9909793' +ValidationKey: '10051000' AutocreateReadme: yes AutocreateCITATION: yes AcceptedWarnings: diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index d85a316..54aa78b 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -44,6 +44,13 @@ jobs: [ -f requirements.txt ] && python -m pip install --upgrade pip wheel || true [ -f requirements.txt ] && pip install -r requirements.txt || true + - name: Run pre-commit checks + shell: bash + run: | + python -m pip install pre-commit + python -m pip freeze --local + pre-commit run --show-diff-on-failure --color=always --all-files + - name: Verify validation key shell: Rscript {0} run: lucode2:::validkey(stopIfInvalid = TRUE) diff --git a/CITATION.cff b/CITATION.cff index 6e6f162..96af9f8 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'lucode2: Code Manipulation and Analysis Tools' -version: 0.49.3 -date-released: '2025-01-13' +version: 0.50.0 +date-released: '2025-01-14' abstract: A collection of tools which allow to manipulate and analyze code. authors: - family-names: Dietrich diff --git a/DESCRIPTION b/DESCRIPTION index 0944601..3ce8f2f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: lucode2 Title: Code Manipulation and Analysis Tools -Version: 0.49.3 -Date: 2025-01-13 +Version: 0.50.0 +Date: 2025-01-14 Authors@R: c( person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre"), comment = c(affiliation = "Potsdam Institute for Climate Impact Research", ORCID = "0000-0002-4309-6431")), diff --git a/R/buildLibrary.R b/R/buildLibrary.R index 0035c2f..eb90c4b 100644 --- a/R/buildLibrary.R +++ b/R/buildLibrary.R @@ -150,12 +150,6 @@ buildLibrary <- function(lib = ".", cran = TRUE, updateType = NULL, # hidden files in inst/extdata produce NOTE during check, so remove leading dot from .pre-commit-config.yaml conditionalCopy(".pre-commit-config.yaml", "pre-commit-config.yaml") - if (packageName != "lucode2") { - preCommitConfig <- sub("autoupdate_schedule: weekly", "autoupdate_schedule: quarterly", - readLines(".pre-commit-config.yaml")) - writeLines(preCommitConfig, ".pre-commit-config.yaml") - } - conditionalCopy("Makefile") ########################################################## diff --git a/README.md b/README.md index 97ac4a2..20bf88c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Code Manipulation and Analysis Tools -R package **lucode2**, version **0.49.3** +R package **lucode2**, version **0.50.0** [![CRAN status](https://www.r-pkg.org/badges/version/lucode2)](https://cran.r-project.org/package=lucode2) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4389418.svg)](https://doi.org/10.5281/zenodo.4389418) [![R build status](https://github.com/pik-piam/lucode2/workflows/check/badge.svg)](https://github.com/pik-piam/lucode2/actions) [![codecov](https://codecov.io/gh/pik-piam/lucode2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/lucode2) [![r-universe](https://pik-piam.r-universe.dev/badges/lucode2)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Jan Philipp Dietrich , Version: 0.49.3, . +Dietrich J, Sauer P, Klein D, Giannousakis A, Bonsch M, Bodirsky B, Baumstark L, Richters O, Pflüger M (2025). "lucode2: Code Manipulation and Analysis Tools." doi:10.5281/zenodo.4389418 , Version: 0.50.0, . A BibTeX entry for LaTeX users is @@ -48,9 +48,9 @@ A BibTeX entry for LaTeX users is title = {lucode2: Code Manipulation and Analysis Tools}, author = {Jan Philipp Dietrich and Pascal Sauer and David Klein and Anastasis Giannousakis and Markus Bonsch and Benjamin Leon Bodirsky and Lavinia Baumstark and Oliver Richters and Mika Pflüger}, doi = {10.5281/zenodo.4389418}, - date = {2025-01-13}, + date = {2025-01-14}, year = {2025}, url = {https://github.com/pik-piam/lucode2}, - note = {Version: 0.49.3}, + note = {Version: 0.50.0}, } ``` diff --git a/inst/extdata/check.yaml b/inst/extdata/check.yaml index d85a316..54aa78b 100644 --- a/inst/extdata/check.yaml +++ b/inst/extdata/check.yaml @@ -44,6 +44,13 @@ jobs: [ -f requirements.txt ] && python -m pip install --upgrade pip wheel || true [ -f requirements.txt ] && pip install -r requirements.txt || true + - name: Run pre-commit checks + shell: bash + run: | + python -m pip install pre-commit + python -m pip freeze --local + pre-commit run --show-diff-on-failure --color=always --all-files + - name: Verify validation key shell: Rscript {0} run: lucode2:::validkey(stopIfInvalid = TRUE)