Skip to content

Commit 51660f4

Browse files
timcdlucastimcdlucas
authored
Merge pull request #4 from simon-smart88/master
Update for v0.4.0
2 parents d967097 + d9e31a6 commit 51660f4

35 files changed

+1037
-1110
lines changed

‎.github/workflows/R-CMD-build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
on:
44
push:
55
branches:
6-
'build'
6+
'build'
77
pull_request:
88
branches:
99
- master
@@ -40,7 +40,6 @@ jobs:
4040
r-version: ${{ matrix.config.r }}
4141
http-user-agent: ${{ matrix.config.http-user-agent }}
4242
use-public-rspm: true
43-
extra-repositories: "https://inla.r-inla-download.org/R/testing"
4443

4544
- name: Install system dependencies on MacOS (X11, gdal)
4645
if: runner.os == 'macOS'
@@ -54,6 +53,7 @@ jobs:
5453
if: runner.os == 'Linux'
5554
run: |
5655
sudo apt-get update -y && sudo apt-get install -y libglu1-mesa-dev
56+
sudo apt-get install -y libproj-dev gdal-bin
5757
5858
- uses: r-lib/actions/setup-r-dependencies@v2
5959
with:

‎.github/workflows/R-CMD-check-HTML5.yaml

Lines changed: 56 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,56 @@
1-
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
2-
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
3-
on:
4-
push:
5-
branches: [html5]
6-
pull_request:
7-
branches: [html5]
8-
9-
name: R-CMD-check-html5
10-
11-
12-
jobs:
13-
HTML5-check:
14-
runs-on: ubuntu-latest
15-
env:
16-
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
17-
RSPM: ${{ matrix.config.rspm }}
18-
19-
steps:
20-
- uses: actions/checkout@v2
21-
22-
- uses: r-lib/actions/setup-r@v2
23-
with:
24-
r-version: ${{ matrix.config.r }}
25-
extra-repositories: "https://inla.r-inla-download.org/R/stable"
26-
27-
28-
- name: Install pdflatex
29-
run: sudo apt-get install texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra
30-
31-
- uses: r-lib/actions/setup-pandoc@v2
32-
33-
- name: Install system dependencies on MacOS (X11, gdal)
34-
if: runner.os == 'macOS'
35-
run: |
36-
brew install --cask xquartz
37-
brew install pkg-config
38-
brew install proj@8
39-
brew install gdal
40-
41-
- uses: r-lib/actions/setup-r-dependencies@v2
42-
with:
43-
dependencies: '"all"'
44-
extra-packages: |
45-
rcmdcheck
46-
47-
- name: Session info
48-
run: |
49-
options(width = 100)
50-
pkgs <- installed.packages()[, "Package"]
51-
sessioninfo::session_info(pkgs, include_base = TRUE)
52-
shell: Rscript {0}
53-
54-
- uses: r-lib/actions/check-r-package@v2
55-
with:
56-
args: '"--as-cran"'
57-
build_args: 'character()'
58-
#error-on: '"note"'
1+
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
2+
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
3+
on:
4+
push:
5+
branches: [html5]
6+
pull_request:
7+
branches: [html5]
8+
9+
name: R-CMD-check-html5
10+
11+
12+
jobs:
13+
HTML5-check:
14+
runs-on: ubuntu-latest
15+
env:
16+
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
17+
RSPM: ${{ matrix.config.rspm }}
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
22+
- uses: r-lib/actions/setup-r@v2
23+
with:
24+
r-version: ${{ matrix.config.r }}
25+
26+
- name: Install pdflatex
27+
run: sudo apt-get install texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra
28+
29+
- uses: r-lib/actions/setup-pandoc@v2
30+
31+
- name: Install system dependencies on MacOS (X11, gdal)
32+
if: runner.os == 'macOS'
33+
run: |
34+
brew install --cask xquartz
35+
brew install pkg-config
36+
brew install proj@8
37+
brew install gdal
38+
39+
- uses: r-lib/actions/setup-r-dependencies@v2
40+
with:
41+
dependencies: '"all"'
42+
extra-packages: |
43+
rcmdcheck
44+
45+
- name: Session info
46+
run: |
47+
options(width = 100)
48+
pkgs <- installed.packages()[, "Package"]
49+
sessioninfo::session_info(pkgs, include_base = TRUE)
50+
shell: Rscript {0}
51+
52+
- uses: r-lib/actions/check-r-package@v2
53+
with:
54+
args: '"--as-cran"'
55+
build_args: 'character()'
56+
#error-on: '"note"'

‎.github/workflows/R-CMD-check-no-suggests.yaml

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

‎.github/workflows/R-CMD-check.yaml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
22
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
3+
4+
# inspired by: https://github.com/r-spatial/sf/blob/main/.github/workflows/R-CMD-check.yaml
35
on:
46
push:
57
branches:
6-
'**'
8+
'**'
79
pull_request:
810
branches:
911
- devel
@@ -21,23 +23,22 @@ jobs:
2123
fail-fast: false
2224
matrix:
2325
config:
24-
# - {os: windows-latest, r: 'release'}
25-
# - {os: macOS-latest, r: 'release'}
26-
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
27-
- {os: ubuntu-20.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
28-
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
26+
- {os: macos-latest, r: 'release'}
27+
- {os: windows-latest, r: 'release'}
28+
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
29+
- {os: ubuntu-latest, r: 'release'}
30+
- {os: ubuntu-latest, r: 'oldrel-1'}
31+
- {os: ubuntu-latest, r: 'oldrel-2'}
2932

3033
env:
3134
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
32-
RSPM: ${{ matrix.config.rspm }}
3335

3436
steps:
3537
- uses: actions/checkout@v2
3638

3739
- uses: r-lib/actions/setup-r@v2
3840
with:
3941
r-version: ${{ matrix.config.r }}
40-
extra-repositories: "https://inla.r-inla-download.org/R/stable"
4142

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

@@ -46,21 +47,13 @@ jobs:
4647
run: |
4748
brew install --cask xquartz
4849
brew install pkg-config
49-
brew install proj@8
50+
brew install proj
5051
brew install gdal
5152
5253
- uses: r-lib/actions/setup-r-dependencies@v2
5354
with:
54-
dependencies: '"all"'
55-
extra-packages: |
56-
rcmdcheck
57-
58-
- name: Session info
59-
run: |
60-
options(width = 100)
61-
pkgs <- installed.packages()[, "Package"]
62-
sessioninfo::session_info(pkgs, include_base = TRUE)
63-
shell: Rscript {0}
55+
extra-packages: any::rcmdcheck
56+
needs: check
6457

6558
- uses: r-lib/actions/check-r-package@v2
6659
env:

‎.gitignore

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
inst/doc
2-
.Rproj.user
3-
.Rhistory
4-
.Rproj
5-
.RData
6-
*.o
7-
*.so
8-
vignettes/disaggregation_cache/*
9-
vignettes/disaggregation_files/*
10-
.github/workflows/R-CMD-check-HTML5.archyaml
11-
vignettes/spatio_temporal_disaggregation.Rmd
1+
inst/doc
2+
.Rproj.user
3+
.Rhistory
4+
*.Rproj
5+
.RData
6+
*.o
7+
*.so
8+
vignettes/disaggregation_cache/*
9+
vignettes/disaggregation_files/*
10+
.github/workflows/R-CMD-check-HTML5.archyaml
11+
vignettes/spatio_temporal_disaggregation.Rmd

‎DESCRIPTION

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: disaggregation
22
Type: Package
33
Title: Disaggregation Modelling
4-
Version: 0.3.0
4+
Version: 0.4.0
55
Authors@R: c(
66
person("Anita", "Nandi", email = "anita.k.nandi@gmail.com", role = "aut", comment = c(ORCID = "0000-0002-5087-2494")),
77
person("Tim", "Lucas", email = "timcdlucas@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-4694-8107")),
@@ -17,7 +17,7 @@ Description: Fits disaggregation regression models using 'TMB' ('Template Model
1717
License: MIT + file LICENSE
1818
Encoding: UTF-8
1919
LazyData: true
20-
RoxygenNote: 7.2.3
20+
RoxygenNote: 7.3.2
2121
Imports:
2222
splancs,
2323
Matrix,
@@ -26,16 +26,15 @@ Imports:
2626
dplyr,
2727
ggplot2,
2828
cowplot,
29+
rSPDE,
2930
sparseMVN,
3031
fmesher,
3132
tidyterra,
3233
terra,
3334
sf,
3435
utils
35-
Additional_repositories: https://inla.r-inla-download.org/R/stable
3636
Suggests:
3737
testthat,
38-
INLA,
3938
knitr,
4039
rmarkdown,
4140
SpatialEpi

‎NAMESPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ S3method(summary,disag_prediction)
1313
export(as.disag_data)
1414
export(build_mesh)
1515
export(disag_model)
16-
export(fit_model)
1716
export(getCovariateRasters)
1817
export(getPolygonData)
1918
export(getStartendindex)
2019
export(make_model_object)
20+
export(plot_disag_model_data)
2121
export(predict_model)
2222
export(predict_uncertainty)
2323
export(prepare_data)

0 commit comments

Comments
 (0)