From 647572bbd98f319a5259b188df6ce6033c78b0f3 Mon Sep 17 00:00:00 2001 From: David Hoetten Date: Wed, 29 May 2024 13:34:15 +0200 Subject: [PATCH] buildLibrary --- .buildlibrary | 2 +- .github/workflows/check.yaml | 13 +++---------- .pre-commit-config.yaml | 4 ++-- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- man/GlobSumAnnTimeseriesFPC.Rd | 2 +- man/GlobSumAnnTimeseriesPFT_harvest.Rd | 2 +- man/GlobSumTimeAvgTableFPC.Rd | 2 +- man/GlobSumTimeAvgTablePFT_harvest.Rd | 2 +- tests/testthat/testBenchmark.R | 2 +- 11 files changed, 18 insertions(+), 25 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 2ce02c0..9dc4d97 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '417039' +ValidationKey: '437184' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index f6ea5d4..7d564a1 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: r-lib/actions/setup-pandoc@v2 @@ -35,7 +35,7 @@ jobs: # gms, goxygen, GDPuc) will usually have an outdated binary version # available; by using extra-packages we get the newest version - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v4 with: python-version: 3.9 @@ -48,11 +48,6 @@ jobs: shell: Rscript {0} run: lucode2:::validkey(stopIfInvalid = TRUE) - - name: Verify that lucode2::buildLibrary was successful - if: github.event_name == 'pull_request' - shell: Rscript {0} - run: lucode2:::isVersionUpdated() - - name: Checks shell: Rscript {0} run: | @@ -61,8 +56,6 @@ jobs: - name: Test coverage shell: Rscript {0} - run: | - nonDummyTests <- setdiff(list.files("./tests/testthat/"), c("test-dummy.R", "_snaps")) - if(length(nonDummyTests) > 0) covr::codecov(quiet = FALSE) + run: covr::codecov(quiet = FALSE) env: NOT_CRAN: "true" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 62f13da..5d2e4ca 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ exclude: '^tests/testthat/_snaps/.*$' repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # frozen: v4.6.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: 7910e0323d7213f34275a7a562b9ef0fde8ce1b9 # frozen: v0.4.2 + rev: v0.3.2.9019 hooks: - id: parsable-R - id: deps-in-desc diff --git a/CITATION.cff b/CITATION.cff index 04eb456..c588911 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: 'lpjmlstats: Statistical tools for LPJmL data analysis' -version: 0.2.1 -date-released: '2024-05-16' +version: 0.2.2 +date-released: '2024-05-29' abstract: This package provides statistical tools for LPJmL data analysis to be used for benchmarking LPJmL outputs. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 4e08a72..3a2d8a1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: lpjmlstats Title: Statistical tools for LPJmL data analysis -Version: 0.2.1 +Version: 0.2.2 Authors@R: c(person("David","Hötten", email = "davidho@pik-potsdam.de", role = c("aut", "cre")), person("Jannes","Breier", email = "jannes.breier@pik-potsdam.de", role = c("aut"))) Description: This package provides statistical tools for LPJmL data analysis @@ -38,4 +38,4 @@ Config/testthat/edition: 3 VignetteBuilder: knitr Depends: R (>= 3.5.0) -Date: 2024-05-16 +Date: 2024-05-29 diff --git a/README.md b/README.md index 6ecb78a..c5acc8c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Statistical tools for LPJmL data analysis -R package **lpjmlstats**, version **0.2.1** +R package **lpjmlstats**, version **0.2.2** [![CRAN status](https://www.r-pkg.org/badges/version/lpjmlstats)](https://cran.r-project.org/package=lpjmlstats) [![R build status](https://gitlab.pik-potsdam.de/lpjml/lpjmlstats/workflows/check/badge.svg)](https://gitlab.pik-potsdam.de/lpjml/lpjmlstats/actions) [![codecov](https://codecov.io/gh/lpjml/lpjmlstats/branch/master/graph/badge.svg)](https://app.codecov.io/gh/lpjml/lpjmlstats) [![r-universe](https://pik-piam.r-universe.dev/badges/lpjmlstats)](https://pik-piam.r-universe.dev/builds) @@ -48,7 +48,7 @@ In case of questions / problems please contact David Hötten }} \describe{ -\item{\code{data}}{LpjmlDataCalc object to be summarized} +\item{\code{data}}{LPJmLDataCalc object to be summarized} } \if{html}{\out{}} } diff --git a/man/GlobSumAnnTimeseriesPFT_harvest.Rd b/man/GlobSumAnnTimeseriesPFT_harvest.Rd index 3600125..6be0b47 100644 --- a/man/GlobSumAnnTimeseriesPFT_harvest.Rd +++ b/man/GlobSumAnnTimeseriesPFT_harvest.Rd @@ -52,7 +52,7 @@ Weigh by cft_frac and then do the same as GlobSumAnnAvgTimeseries \subsection{Arguments}{ \if{html}{\out{
}} \describe{ -\item{\code{data}}{LpjmlDataCalc object to be summarized} +\item{\code{data}}{LPJmLDataCalc object to be summarized} } \if{html}{\out{
}} } diff --git a/man/GlobSumTimeAvgTableFPC.Rd b/man/GlobSumTimeAvgTableFPC.Rd index 052bfcc..321dd7f 100644 --- a/man/GlobSumTimeAvgTableFPC.Rd +++ b/man/GlobSumTimeAvgTableFPC.Rd @@ -52,7 +52,7 @@ Weigh by natural stand fraction and then do the same as GlobSumTimeAvgTable \subsection{Arguments}{ \if{html}{\out{
}} \describe{ -\item{\code{data}}{LpjmlDataCalc object to be summarized} +\item{\code{data}}{LPJmLDataCalc object to be summarized} } \if{html}{\out{
}} } diff --git a/man/GlobSumTimeAvgTablePFT_harvest.Rd b/man/GlobSumTimeAvgTablePFT_harvest.Rd index a7dd8ed..ddfca5a 100644 --- a/man/GlobSumTimeAvgTablePFT_harvest.Rd +++ b/man/GlobSumTimeAvgTablePFT_harvest.Rd @@ -52,7 +52,7 @@ Weigh by cft_frac and then do the same as GlobSumTimeAvgTable \subsection{Arguments}{ \if{html}{\out{
}} \describe{ -\item{\code{data}}{LpjmlDataCalc object to be summarized} +\item{\code{data}}{LPJmLDataCalc object to be summarized} } \if{html}{\out{
}} } diff --git a/tests/testthat/testBenchmark.R b/tests/testthat/testBenchmark.R index 4276e61..a98fea9 100644 --- a/tests/testthat/testBenchmark.R +++ b/tests/testthat/testBenchmark.R @@ -81,7 +81,7 @@ test_that("benchmark works for davids personal directory", { pdf_report = FALSE ) - create_pdf_report(data = bench_data) + create_pdf_report(bench_data) prepare_tibble_for_table(bench_data$GlobSumTimeAvgTable$var_grp_list)