Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3ba585d
Merge branch 'release/1.1.7' into development
MarselScheer Sep 23, 2020
971a8ec
prepare next dev-cycle
MarselScheer Sep 23, 2020
2a14c66
Merge branch 'feat/next-dev-cycle' into development
MarselScheer Sep 23, 2020
cd45c94
update R-version in renv
MarselScheer Sep 5, 2021
19e6deb
travis-ci not used anymore
MarselScheer Sep 5, 2021
293be43
update README
MarselScheer Sep 5, 2021
ed53fe1
add R-cmd-check issues and use ignore-files from Rpkgtemplate
MarselScheer Sep 5, 2021
c36df2b
copy Makefile and LICENSE from Rpkgtemplate
MarselScheer Sep 5, 2021
5a294d7
use docker from Rpkgtemplate
MarselScheer Sep 5, 2021
97fa5e4
pkgdown-site will be build by gh-actions
MarselScheer Sep 5, 2021
cf4c473
add gh-actions from Rpkgtemplate
MarselScheer Sep 5, 2021
ee31237
update branch names in gh-actions
MarselScheer Sep 5, 2021
6db753e
add lintr-package to pipeline and Suggest-field
MarselScheer Sep 5, 2021
e1f62fc
reduce threshold for coverage, extend suggest-field
MarselScheer Sep 5, 2021
2a78ea4
Merge pull request #5 from MarselScheer/feat/apply_rpkgtemplate
MarselScheer Sep 6, 2021
e90346e
switch to docker-compose for the ide
MarselScheer Apr 2, 2025
54f26bf
fix that attr cannot be applied to primitives in upcoming R-version
MarselScheer Apr 3, 2025
b0d971a
fix explicit linking to package for objects from other pkgs
MarselScheer Apr 3, 2025
1938d5d
fix ci
MarselScheer Apr 3, 2025
a4d7275
fix output change of boot-package in vignette
MarselScheer Apr 3, 2025
5e228ba
update versions in ci
MarselScheer Apr 5, 2025
6a6d08b
deactivate linting for now
MarselScheer Apr 5, 2025
4ea33bb
fix warnings/errors when building pkgdown
MarselScheer Apr 5, 2025
c91c308
add pkgdown build to feature branch checks
MarselScheer Apr 5, 2025
9d8f85f
update readme/news
MarselScheer Apr 5, 2025
0abaafa
Merge pull request #7 from MarselScheer/feat/fix/attr-does-not-work-f…
MarselScheer Apr 5, 2025
bccf782
copy paste from https://github.com/tidyverse/dplyr/blob/main/.github/…
MarselScheer Apr 5, 2025
be95e61
Merge pull request #8 from MarselScheer/fix-pkgdown
MarselScheer Apr 5, 2025
cf626c7
update version in DESCRIPTION and NEWS
MarselScheer Apr 9, 2025
c965af6
correct/rm URLs according to cran checks on CRAN after submission
MarselScheer Apr 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
^renv$
^renv\.lock$
^.*\.Rproj$
^\.Rproj\.user$
^\.travis\.yml$
^README\.Rmd$
^README\.md$
^NEWS\.md$
^README-.*\.png$
^_pkgdown.yml
^docs/
^docker/
^renv$
^renv\.lock$
README.Rmd
Makefile
LICENSE
^\.github$
_pkgdown.yml
docs/
docker/
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
73 changes: 73 additions & 0 deletions .github/workflows/Features.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [feat/**]
paths: [DESCRIPTION, .Rbuildignore, R/**, tests/**, inst/**, .github/**]


name: Feature-branch-checks

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: true
matrix:
config:
- {os: ubuntu-latest, r: 'release'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v4

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

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck, covr, tinytest, lintr, pkgdown

# - name: Lint
# run: |
# library(tinytest)
# out <- lintr::lint_dir()
# if (0 < length(out)) stop("Linting failure") else print("Linting successful")
# shell: Rscript {0}

- name: Coverage
run: |
library(tinytest)
roxygen2::roxygenize()
test_covr <- covr::percent_coverage(covr::package_coverage())
if (test_covr < 90) stop(sprintf("Coverage of %s (<90) too low", lowest_covr_value))
shell: Rscript {0}

- name: Check
env:
_R_CHECK_CRAN_INCOMING_: false
run: |
options(crayon.enabled = TRUE)
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}

- name: Check if pkgdown site can be build
run: make pkgdown
shell: bash

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
60 changes: 60 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [master, development]
paths: [DESCRIPTION, .Rbuildignore, R/**, tests/**, inst/**, .github/**]
pull_request:
branches: [master, development]
paths: [DESCRIPTION, .Rbuildignore, R/**, tests/**, inst/**, .github/**]

name: R-CMD-check

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v4

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

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck

- name: Check
env:
_R_CHECK_CRAN_INCOMING_: false
run: |
options(crayon.enabled = TRUE)
roxygen2::roxygenize()
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
46 changes: 46 additions & 0 deletions .github/workflows/Test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [master, development]
paths: [DESCRIPTION, .Rbuildignore, R/**, tests/**, inst/**, .github/**]

name: Test coverage

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: true
matrix:
config:
- {os: ubuntu-latest, r: 'release'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

steps:
- uses: actions/checkout@v4

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

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: covr, tinytest

- name: Coverage
run: |
library(tinytest)
roxygen2::roxygenize()
covr::codecov()
shell: Rscript {0}
38 changes: 38 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [development]

name: pkgdown

jobs:
pkgdown:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v4

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

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

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/github-pages-deploy-action@v4.5.0
with:
clean: false
branch: gh-pages
folder: docs
49 changes: 45 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,47 @@
.Rproj.user
# History files
.Rhistory
.Rapp.history

# Session Data files
.RData
.Rprofile
inst/doc
renv/

# User-specific files
.Ruserdata

# Example code in package build process
*-Ex.R

# Output files from R CMD build
/*.tar.gz

# Output files from R CMD check
/*.Rcheck/

# RStudio files
.Rproj.user/

# produced vignettes
vignettes/*.html
vignettes/*.pdf

# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
.httr-oauth

# knitr and R markdown default cache directories
*_cache/
/cache/

# Temporary files created by R markdown
*.utf8.md
*.knit.md

# R Environment Variables
.Renviron

# Roxygen generated files
NAMESPACE
man/

# pkgdown generated files
docs/
/docker/.env
16 changes: 0 additions & 16 deletions .travis.yml

This file was deleted.

11 changes: 7 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: simTool
Type: Package
Title: Conduct Simulation Studies with a Minimal Amount of Source Code
Version: 1.1.7
Version: 1.1.8
Authors@R: person("Marsel", "Scheer", role = c("aut", "cre"), email = "scheer@freescience.de")
Maintainer: Marsel Scheer <scheer@freescience.de>
Description: Tool for statistical simulations that have two components.
Expand All @@ -28,9 +28,12 @@ Suggests:
boot,
broom,
rmarkdown,
tinytest
tinytest,
lintr,
roxygen2,
covr
License: GPL-3
VignetteBuilder: knitr
RoxygenNote: 7.1.1
URL: https://github.com/MarselScheer/simTool
RoxygenNote: 7.3.2
URL: https://marselscheer.github.io/simTool/
BugReports: https://github.com/MarselScheer/simTool/issues
Loading