Skip to content

Commit 7967cb1

Browse files
author
Raphael Sonabend
authored
Merge pull request #247 from alan-turing-institute/1.5.2.9000
1.5.3
2 parents 7efc92b + 1e7b20c commit 7967cb1

File tree

8 files changed

+191
-160
lines changed

8 files changed

+191
-160
lines changed

‎.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
cran-comments\.md
66
^CRAN-RELEASE$
77
docs
8+
scripts
89
Licensing
910
CODE\_OF\_CONDUCT\.md
1011
CONTRIBUTING\.md

‎.github/workflows/pkgdown.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
on:
2+
push:
3+
branches: main
4+
5+
name: pkgdown
6+
7+
jobs:
8+
pkgdown:
9+
runs-on: macOS-latest
10+
env:
11+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
12+
steps:
13+
- uses: actions/checkout@v2
14+
15+
- uses: r-lib/actions/setup-r@master
16+
17+
- uses: r-lib/actions/setup-pandoc@master
18+
19+
- name: Query dependencies
20+
run: |
21+
install.packages('remotes')
22+
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
23+
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
24+
shell: Rscript {0}
25+
26+
- name: Cache R packages
27+
uses: actions/cache@v1
28+
with:
29+
path: ${{ env.R_LIBS_USER }}
30+
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
31+
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
32+
33+
- name: Install dependencies
34+
run: |
35+
remotes::install_deps(dependencies = TRUE)
36+
install.packages("pkgdown")
37+
remotes::install_github("mlr-org/mlr3pkgdowntemplate")
38+
shell: Rscript {0}
39+
40+
- name: Install package
41+
run: R CMD INSTALL .
42+
43+
- name: Deploy package
44+
run: |
45+
git config --local user.email "actions@github.com"
46+
git config --local user.name "GitHub Actions"
47+
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
48+

‎.github/workflows/rcmdcheck.yml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
on:
2+
pull_request:
3+
branches: main
4+
schedule:
5+
- cron: "0 4 * * *"
6+
7+
name: Check/Codecov/Render
8+
9+
jobs:
10+
R-CMD-check:
11+
runs-on: ${{ matrix.config.os }}
12+
13+
name: R CMD Check (${{ matrix.config.os }} (${{ matrix.config.r }}))
14+
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
config:
19+
- { os: windows-latest, r: "release" }
20+
- { os: windows-latest, r: "3.6" }
21+
- { os: windows-latest, r: "devel" }
22+
- { os: macOS-latest, r: "release" }
23+
24+
env:
25+
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
26+
RSPM: ${{ matrix.config.rspm }}
27+
28+
steps:
29+
- uses: actions/checkout@v2
30+
31+
- uses: r-lib/actions/setup-r@master
32+
with:
33+
r-version: ${{ matrix.config.r }}
34+
35+
- uses: r-lib/actions/setup-pandoc@master
36+
37+
- name: Query dependencies
38+
run: |
39+
install.packages(c("remotes", "devtools"))
40+
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
41+
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
42+
shell: Rscript {0}
43+
44+
- name: Cache R packages
45+
uses: actions/cache@v1
46+
with:
47+
path: ${{ env.R_LIBS_USER }}
48+
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
49+
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
50+
51+
- name: Install dependencies
52+
run: |
53+
remotes::install_deps(dependencies = TRUE)
54+
remotes::install_cran("rcmdcheck")
55+
shell: Rscript {0}
56+
57+
- name: Check
58+
env:
59+
_R_CHECK_CRAN_INCOMING_REMOTE_: false
60+
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
61+
shell: Rscript {0}
62+
63+
- name: Upload check results
64+
if: failure()
65+
uses: actions/upload-artifact@main
66+
with:
67+
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
68+
path: check
69+
70+
- name: Install covr
71+
if: ${{ github.event_name == 'pull_request' && runner.os == 'macOS' }}
72+
run: install.packages('covr')
73+
shell: Rscript {0}
74+
75+
- name: Test coverage
76+
if: ${{ github.event_name == 'pull_request' && runner.os == 'macOS' }}
77+
run: covr::codecov()
78+
shell: Rscript {0}
79+
80+
- name: Render rmd
81+
if: ${{ github.event_name == 'pull_request' && runner.os == 'macOS' }}
82+
run: |
83+
devtools::install()
84+
rmarkdown::render('README.Rmd')
85+
shell: Rscript {0}
86+
87+
- name: Commit changes
88+
if: ${{ github.event_name == 'pull_request' && runner.os == 'macOS' }}
89+
uses: EndBug/add-and-commit@v7
90+
with:
91+
author_name: github-actions
92+
author_email: 41898282+github-actions[bot]@users.noreply.github.com
93+
message: 'Update README.md'
94+
add: 'README.md'
95+

‎.github/workflows/tic.yml

Lines changed: 0 additions & 127 deletions
This file was deleted.

‎.github/workflows/version-check.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
on:
2+
pull_request:
3+
branches: main
4+
5+
name: Version Check
6+
7+
jobs:
8+
all:
9+
runs-on: ${{ matrix.config.os }}
10+
11+
name: Check Version Test
12+
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
config:
17+
- { os: ubuntu-latest, r: "release" }
18+
19+
env:
20+
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
21+
RGL_USE_NULL: true
22+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
23+
24+
steps:
25+
- uses: actions/checkout@v2.1.1
26+
27+
- name: New version
28+
run: |
29+
echo "NEW_VERSION=$(grep '^Version' DESCRIPTION | sed 's/.*: *//')" >> $GITHUB_ENV
30+
31+
- uses: actions/checkout@v2
32+
with:
33+
ref: main
34+
35+
- name: Old version
36+
run: |
37+
echo "OLD_VERSION=$(grep '^Version' DESCRIPTION | sed 's/.*: *//')" >> $GITHUB_ENV
38+
39+
- name: Compare versions
40+
run: |
41+
Rscript -e "if (commandArgs(TRUE)[1] <= commandArgs(TRUE)[2]) stop('Package version has not been updated.')" ${{ env.NEW_VERSION }} ${{ env.OLD_VERSION }}
42+
43+
- name: Check version format
44+
run: |
45+
Rscript -e "if (!grepl('^[0-9]+\\\.[0-9]+\\\.[0-9]+$', commandArgs(TRUE)[1])) stop('Format of package version must be major.minor.patch.')" ${{ env.NEW_VERSION }}

‎.travis.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎DESCRIPTION

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Package: distr6
22
Title: The Complete R6 Probability Distributions Interface
3-
Version: 1.5.2
3+
Version: 1.5.3
44
Authors@R:
55
c(person(given = "Raphael",
66
family = "Sonabend",
77
role = c("aut","cre"),
8-
email = "raphael.sonabend.15@ucl.ac.uk",
8+
email = "raphaelsonabend@gmail.com",
99
comment = c(ORCID = "0000-0001-9225-4654")),
1010
person(given = "Franz",
1111
family = "Kiraly",
@@ -87,7 +87,6 @@ Suggests:
8787
plotly,
8888
pracma
8989
License: MIT + file LICENSE
90-
LazyData: true
9190
URL: https://alan-turing-institute.github.io/distr6/, https://github.com/alan-turing-institute/distr6/
9291
BugReports: https://github.com/alan-turing-institute/distr6/issues
9392
VignetteBuilder:

‎tic.R

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)