diff --git a/.Rbuildignore b/.Rbuildignore index 8465541..fc179d5 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -13,3 +13,5 @@ ^Makefile$ ^.*CITATION.cff$ ^output$ +^\.claude$ +^_pkgdown\.yml$ diff --git a/.buildlibrary b/.buildlibrary index 58554c3..bb02ca9 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '318782072' +ValidationKey: '319361056' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' @@ -14,3 +14,4 @@ allowLinterWarnings: yes enforceVersionUpdate: no skipCoverage: no AutocreateCITATION: yes +UsePkgDown: no diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index e7ef0c4..28fd393 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -11,37 +11,22 @@ jobs: check: runs-on: ubuntu-latest if: github.event.pull_request.draft == false + container: + image: ghcr.io/pik-piam/ci-image:latest steps: - uses: actions/checkout@v4 - - uses: r-lib/actions/setup-pandoc@v2 - - - uses: r-lib/actions/setup-r@v2 - with: - use-public-rspm: true - extra-repositories: "https://rse.pik-potsdam.de/r/packages" - - - uses: r-lib/actions/setup-r-dependencies@v2 - with: - extra-packages: | - lucode2 - covr - madrat - magclass - citation - gms - goxygen - GDPuc - # piam packages also available on CRAN (madrat, magclass, citation, - # gms, goxygen, GDPuc) will usually have an outdated binary version - # available; by using extra-packages we get the newest version - + - name: Install package and dependencies + shell: Rscript {0} + run: | + options(repos = c(pikpiam = 'https://pik-piam.r-universe.dev', + CRAN = Sys.getenv('RSPM'))) + pak::pak() + - 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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3edf90a..b1ab7b4 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: 3b70240796cdccbe1474b0176560281aaded97e6 # frozen: v0.4.3.9003 + rev: v0.4.3.9021 hooks: - id: parsable-R - id: deps-in-desc diff --git a/CITATION.cff b/CITATION.cff index e9eceb6..1b1788a 100755 --- 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: 'mip: Comparison of multi-model runs' -version: 0.155.11 -date-released: '2026-04-09' +version: 0.155.12 +date-released: '2026-05-15' abstract: Package contains generic functions to produce comparison plots of multi-model runs. authors: diff --git a/DESCRIPTION b/DESCRIPTION index d05cc3a..66c6d3c 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mip Title: Comparison of multi-model runs -Version: 0.155.11 -Date: 2026-04-09 +Version: 0.155.12 +Date: 2026-05-15 Authors@R: c( person("David", "Klein", , "dklein@pik-potsdam.de", role = c("aut", "cre")), person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"), diff --git a/README.md b/README.md index d155409..da34cec 100755 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Comparison of multi-model runs -R package **mip**, version **0.155.11** +R package **mip**, version **0.155.12** -[![CRAN status](https://www.r-pkg.org/badges/version/mip)](https://cran.r-project.org/package=mip) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158586.svg)](https://doi.org/10.5281/zenodo.1158586) [![R build status](https://github.com/pik-piam/mip/workflows/check/badge.svg)](https://github.com/pik-piam/mip/actions) [![codecov](https://codecov.io/gh/pik-piam/mip/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mip) [![r-universe](https://pik-piam.r-universe.dev/badges/mip)](https://pik-piam.r-universe.dev/builds) + [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158586.svg)](https://doi.org/10.5281/zenodo.1158586) [![R build status](https://github.com/pik-piam/mip/workflows/check/badge.svg)](https://github.com/pik-piam/mip/actions) [![codecov](https://codecov.io/gh/pik-piam/mip/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mip) [![r-universe](https://pik-piam.r-universe.dev/badges/mip)](https://pik-piam.r-universe.dev/builds) ## Purpose and Functionality @@ -47,7 +47,7 @@ In case of questions / problems please contact David Klein , Version: 0.155.11, . +Klein D, Dietrich J, Baumstark L, Humpenoeder F, Stevanovic M, Wirth S, Führlich P, Richters O, Rüter T, Salzwedel R, Lécuyer F (2026). "mip: Comparison of multi-model runs." doi:10.5281/zenodo.1158586 , Version: 0.155.12, . A BibTeX entry for LaTeX users is @@ -56,9 +56,9 @@ A BibTeX entry for LaTeX users is title = {mip: Comparison of multi-model runs}, author = {David Klein and Jan Philipp Dietrich and Lavinia Baumstark and Florian Humpenoeder and Miodrag Stevanovic and Stephen Wirth and Pascal Führlich and Oliver Richters and Tonn Rüter and Robert Salzwedel and Fabrice Lécuyer}, doi = {10.5281/zenodo.1158586}, - date = {2026-04-09}, + date = {2026-05-15}, year = {2026}, url = {https://github.com/pik-piam/mip}, - note = {Version: 0.155.11}, + note = {Version: 0.155.12}, } ``` diff --git a/inst/extdata/plotstyle.csv b/inst/extdata/plotstyle.csv index 0e920be..3f48d46 100644 --- a/inst/extdata/plotstyle.csv +++ b/inst/extdata/plotstyle.csv @@ -489,6 +489,7 @@ non-Heating|Electricity|ICT pCap;ICT pCap;#ffd966;; non-Heating|Electricity|Space Cooling pCap;Space Cooling pCap;#9d4edd;; District Heating pCap;District heating pCap;#cc0000;; Electricity|Resistance;Resistive electric heating;#f58231;; +Electricity|Resistive electric;Resistive electric;#f58231;; Electricity|Heat pump;Heat pumps;#3cb44b;; Electricity|Resistance pCap;Resistive electric heating pCap;#f58231;; Electricity|Heat pump pCap;Heat pumps pCap;#3cb44b;;