Skip to content

Commit

Permalink
prep CRAN release (v2.0.10)
Browse files Browse the repository at this point in the history
- remove `SpaDES.addins` dependency;
- update NEWS to use recommended formatting;
- update CHA workflows;
  • Loading branch information
achubaty committed Apr 4, 2024
1 parent d27b27b commit d34ca4c
Show file tree
Hide file tree
Showing 7 changed files with 132 additions and 75 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
- {os: macOS-latest, nosuggests: false, r: 'release'}
- {os: windows-latest, nosuggests: false, r: 'devel'}
- {os: windows-latest, nosuggests: false, r: 'release'}
- {os: windows-latest, nosuggests: true, r: 'release'}
- {os: windows-latest, nosuggests: false, r: 'oldrel'}
- {os: ubuntu-20.04, nosuggests: false, r: 'devel'}
- {os: ubuntu-20.04, nosuggests: false, r: 'release'}
- {os: ubuntu-20.04, nosuggests: true, r: 'release'}
Expand Down Expand Up @@ -53,15 +55,12 @@ jobs:
any::rcmdcheck
fastshp=?ignore
NLMR=?ignore
PredictiveEcology/Require@development
PredictiveEcology/reproducible@development
PredictiveEcology/SpaDES.tools@development
needs: check

- name: Install additional package dependencies
run: |
pak::pkg_install("ropensci/NLMR")
remotes::install_github("s-u/fastshp")
pak::pkg_install("s-u/fastshp")
shell: Rscript {0}

- uses: r-lib/actions/check-r-package@v2
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2

- uses: PredictiveEcology/actions/[email protected]

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true
Ncpus: 2
use-public-rspm: false

- uses: r-lib/actions/setup-r-dependencies@v2
with:
Expand All @@ -43,7 +46,7 @@ jobs:
- name: Install additional package dependencies
run: |
pak::pkg_install("ropensci/NLMR")
remotes::install_github("s-u/fastshp")
pak::pkg_install("s-u/fastshp")
shell: Rscript {0}

- name: Build site
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
runs-on: macOS-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
USING_COVR: true

steps:
- uses: actions/checkout@v4
Expand All @@ -42,9 +43,10 @@ jobs:
- name: Install additional package dependencies
run: |
pak::pkg_install("ropensci/NLMR")
remotes::install_github("s-u/fastshp")
pak::pkg_install("s-u/fastshp")
shell: Rscript {0}

- name: Test coverage
run: covr::codecov()
shell: Rscript {0}

61 changes: 61 additions & 0 deletions .github/workflows/update-citation-cff.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# The action runs when:
# - A new release is published
# - The DESCRIPTION or inst/CITATION are modified
# - Can be run manually
# For customizing the triggers, visit https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows
on:
release:
types: [published]
push:
branches: [master, main]
paths:
- DESCRIPTION
- inst/CITATION
workflow_dispatch:

name: Update CITATION.cff

jobs:
update-citation-cff:
runs-on: macos-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v4
- uses: PredictiveEcology/actions/[email protected]
- uses: r-lib/actions/setup-r@v2
with:
Ncpus: 2
r-version: ${{ matrix.config.r }}
use-public-rspm: false
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: |
any::cffr
any::V8
- name: Update CITATION.cff
run: |
library(cffr)
# Customize with your own code
# See https://docs.ropensci.org/cffr/articles/cffr.html
# Write your own keys
mykeys <- list()
# Create your CITATION.cff file
cff_write(keys = mykeys)
shell: Rscript {0}

- name: Commit results
run: |
git config --local user.name "github-actions[bot]"
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add CITATION.cff
git commit -m 'Update CITATION.cff' || echo "No changes to commit"
git push origin || echo "No changes to commit"
18 changes: 8 additions & 10 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Description: Metapackage for implementing a variety of event-based models, with
URL:
https://spades.predictiveecology.org,
https://github.com/PredictiveEcology/SpaDES
Date: 2024-01-31
Version: 2.0.9.9000
Date: 2024-04-04
Version: 2.0.10
Authors@R: c(
person("Alex M", "Chubaty", email = "[email protected]",
role = c("aut", "cre"), comment = c(ORCID = "0000-0001-7146-8135")),
Expand All @@ -35,21 +35,19 @@ Depends:
R (>= 4.2)
Imports:
methods,
quickPlot,
reproducible (>= 1.2.2),
SpaDES.core (>= 1.0.4),
SpaDES.tools,
quickPlot (>= 1.0.2),
reproducible (>= 2.0.11),
SpaDES.core (>= 2.0.3),
SpaDES.tools (>= 2.0.5),
utils
Suggests:
covr,
knitr,
rmarkdown,
testthat,
SpaDES.addins
testthat
Remotes:
PredictiveEcology/quickPlot@development,
PredictiveEcology/reproducible@development,
PredictiveEcology/SpaDES.addins@development,
PredictiveEcology/SpaDES.core@development,
PredictiveEcology/SpaDES.tools@development,
Encoding: UTF-8
Expand All @@ -61,5 +59,5 @@ ByteCompile: yes
Collate:
'spades-package.R'
'zzz.R'
RoxygenNote: 7.2.1
RoxygenNote: 7.3.1
Roxygen: list(markdown = TRUE)
Loading

0 comments on commit d34ca4c

Please sign in to comment.