Skip to content

Commit ad6ed9d

Browse files
authored
Final checks / modifications before submitting to CRAN (#74)
* Removing configure from the package and addressing compiler warnings in comparing int with uword * Fixing missing image
1 parent f2164fe commit ad6ed9d

22 files changed

+134
-3867
lines changed

.Rbuildignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ README[.](R|q)md
3232
^next_release\.md$
3333
^src/rgraph_scale_free.+$
3434
makefile
35-
^src/Makevars$
3635
^docs$
3736
^LICENSE\.md$
3837
^_pkgdown\.yml$

.devcontainer/Containerfile

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
FROM ghcr.io/rocker-org/devcontainer/tidyverse:4.5
1+
FROM ghcr.io/rocker-org/devcontainer/r-ver:4.5
22

3-
# RUN \
4-
# echo 'options(repos=c(CRAN="https://packagemanager.posit.co/cran/__linux__/bookworm/latest"))' >> ~/.Rprofile && \
5-
# Rscript --vanilla -e 'getOption("repos")'
3+
# Architecture-specific variable (built in Docker BuildKit)
4+
ARG TARGETARCH
65

7-
RUN install2.r --error languageserver && installGithub.r nx10/httpgd
6+
# Install quarto-cli and the orange-book extension
7+
RUN wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.9.35/quarto-1.9.35-linux-${TARGETARCH}.deb && \
8+
dpkg -i quarto-1.9.35-linux-${TARGETARCH}.deb && \
9+
rm quarto-1.9.35-linux-${TARGETARCH}.deb
810

911
RUN apt-get update && apt-get install --no-install-recommends -y valgrind gdb \
1012
libglpk-dev
1113

1214
# Adding R packages
13-
RUN install2.r --error Rcpp sna network networkDynamic Matrix MASS MatchIt SparseM igraph \
14-
viridisLite covr testthat knitr rmarkdown ape RSiena survival RcppArmadillo
15+
RUN install2.r --error -n4 Rcpp sna network networkDynamic Matrix MASS \
16+
MatchIt SparseM igraph \
17+
viridisLite covr testthat knitr rmarkdown ape RSiena survival \
18+
RcppArmadillo
1519

1620
CMD ["bash"]

.devcontainer/devcontainer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"rdebugger.r-debugger",
1313
"quarto.quarto",
1414
"tianyishi.rmarkdown",
15-
"github.vscode-github-actions"
15+
"github.vscode-github-actions",
16+
"openai.chatgpt"
1617
]
1718
}
1819
},

.github/workflows/pkgdown.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
id-token: write
2525
pages: write
2626
steps:
27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2828

2929
- uses: r-lib/actions/setup-pandoc@v2
3030
with:
@@ -65,4 +65,4 @@ jobs:
6565

6666
steps:
6767
- name: Deploy to GitHub pages
68-
uses: actions/deploy-pages@v4
68+
uses: actions/deploy-pages@v5

.github/workflows/r.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Configure git
4040
run: git config --global core.autocrlf false
4141

42-
- uses: actions/checkout@v5
42+
- uses: actions/checkout@v6
4343

4444
- uses: r-lib/actions/setup-r@v2
4545
with:
@@ -78,7 +78,7 @@ jobs:
7878
build-pkg:
7979
runs-on: ubuntu-latest
8080
steps:
81-
- uses: actions/checkout@v5
81+
- uses: actions/checkout@v6
8282

8383
- uses: r-lib/actions/setup-r@v2
8484
with:
@@ -93,7 +93,7 @@ jobs:
9393
run: R CMD build .
9494

9595
- name: Upload package artifact
96-
uses: actions/upload-artifact@v5
96+
uses: actions/upload-artifact@v7
9797
with:
9898
name: R-package
9999
path: '*.tar.gz'

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ help:
99
@echo " make docs - Generate documentation"
1010

1111
install:
12-
Rscript --vanilla -e 'devtools::install()'
12+
Rscript -e 'devtools::install()'
1313

1414
build:
1515
R CMD build .
@@ -18,7 +18,7 @@ README.md: README.qmd
1818
quarto render README.qmd
1919

2020
check:
21-
Rscript --vanilla -e 'devtools::check()'
21+
Rscript -e 'devtools::check()'
2222

2323
checkv: netdiffuseR_$(VERSION).tar.gz
2424
R CMD check --as-cran --use-valgrind netdiffuseR_$(VERSION).tar.gz
@@ -27,6 +27,6 @@ clean:
2727
rm -rf netdiffuseR.Rcheck src/*.so src/*.o
2828

2929
docs:
30-
Rscript --vanilla -e 'devtools::document()'
30+
Rscript -e 'devtools::document()'
3131

3232
.PHONY: check checkv clean install docs

NEWS.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Changes in netdiffuseR version 1.25.0 (2026-03-14)
1+
# Changes in netdiffuseR version 1.25.0 (2026-03-27)
2+
3+
## User-visible changes
24

35
* New function `collapse_timeframes()`: aggregates high-resolution or
46
continuous-time longitudinal edgelists into discrete time windows, ready
@@ -9,10 +11,15 @@
911
* New dataset `epigames` and `epigamesDiffNet`: a simulated epidemic game
1012
network with 594 nodes and 15 time periods from the WKU Epi Games study.
1113

14+
## Internal changes
15+
1216
* Fixed CRAN example error in `round_to_seq()`: `plot(w, x)` replaced with
1317
`plot(w)` to avoid `%||%` operator issue in R 4.4.0+'s `formula.default`
1418
when called via `plot.data.frame()`.
1519

20+
* Removed `configure` framework. R already provides paths and configuration for OpenMP.
21+
22+
1623
# Changes in netdiffuseR version 1.24.0 (2025-12-09)
1724

1825
* New function `degree_adoption_diagnostic()` analyzes the correlation between network

README.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ And the actual R package:
5252
Vega Yon G, Olivera Morales A, Valente T (2025). _netdiffuseR:
5353
Analysis of Diffusion and Contagion Processes on Networks_.
5454
doi:10.5281/zenodo.1039317 <https://doi.org/10.5281/zenodo.1039317>,
55-
R package version 1.24.1, <https://github.com/USCCANA/netdiffuseR>.
55+
R package version 1.25.0, <https://github.com/USCCANA/netdiffuseR>.
5656

5757
To see these entries in BibTeX format, use 'print(<citation>,
5858
bibtex=TRUE)', 'toBibtex(.)', or set
@@ -351,13 +351,13 @@ par(oldpar)
351351

352352
``` r
353353
sessionInfo()
354-
#> R version 4.5.2 (2025-10-31)
355-
#> Platform: x86_64-pc-linux-gnu
356-
#> Running under: Ubuntu 24.04.3 LTS
354+
#> R version 4.5.3 (2026-03-11)
355+
#> Platform: aarch64-unknown-linux-gnu
356+
#> Running under: Ubuntu 24.04.4 LTS
357357
#>
358358
#> Matrix products: default
359-
#> BLAS: /usr/lib/x86_64-linux-gnu/openblas-pthread/libblas.so.3
360-
#> LAPACK: /usr/lib/x86_64-linux-gnu/openblas-pthread/libopenblasp-r0.3.26.so; LAPACK version 3.12.0
359+
#> BLAS: /usr/lib/aarch64-linux-gnu/openblas-pthread/libblas.so.3
360+
#> LAPACK: /usr/lib/aarch64-linux-gnu/openblas-pthread/libopenblasp-r0.3.26.so; LAPACK version 3.12.0
361361
#>
362362
#> locale:
363363
#> [1] LC_CTYPE=en_US.UTF-8 LC_NUMERIC=C
@@ -374,23 +374,23 @@ sessionInfo()
374374
#> [1] stats graphics grDevices utils datasets methods base
375375
#>
376376
#> other attached packages:
377-
#> [1] netdiffuseR_1.24.1
377+
#> [1] netdiffuseR_1.25.0
378378
#>
379379
#> loaded via a namespace (and not attached):
380-
#> [1] Matrix_1.7-4 jsonlite_2.0.0 dplyr_1.1.4
381-
#> [4] compiler_4.5.2 tidyselect_1.2.1 Rcpp_1.1.0
382-
#> [7] networkLite_1.1.0 boot_1.3-32 yaml_2.3.10
383-
#> [10] fastmap_1.2.0 lattice_0.22-7 coda_0.19-4.1
380+
#> [1] Matrix_1.7-5 jsonlite_2.0.0 dplyr_1.2.0
381+
#> [4] compiler_4.5.3 tidyselect_1.2.1 Rcpp_1.1.1
382+
#> [7] networkLite_1.1.0 boot_1.3-32 yaml_2.3.12
383+
#> [10] fastmap_1.2.0 lattice_0.22-9 coda_0.19-4.1
384384
#> [13] R6_2.6.1 generics_0.1.4 MatchIt_4.7.2
385-
#> [16] igraph_2.2.1 knitr_1.50 MASS_7.3-65
386-
#> [19] backports_1.5.0 tibble_3.3.0 statnet.common_4.12.0
387-
#> [22] pillar_1.11.1 rlang_1.1.6 xfun_0.53
388-
#> [25] viridisLite_0.4.2 cli_3.6.5 magrittr_2.0.4
389-
#> [28] network_1.19.0 digest_0.6.37 grid_4.5.2
390-
#> [31] lifecycle_1.0.4 vctrs_0.6.5 sna_2.8
391-
#> [34] evaluate_1.0.5 SparseM_1.84-2 glue_1.8.0
392-
#> [37] rmarkdown_2.30 tools_4.5.2 pkgconfig_2.0.3
393-
#> [40] networkDynamic_0.11.5 htmltools_0.5.8.1
385+
#> [16] igraph_2.2.2 knitr_1.51 MASS_7.3-65
386+
#> [19] backports_1.5.0 tibble_3.3.1 statnet.common_4.13.0
387+
#> [22] pillar_1.11.1 rlang_1.1.7 xfun_0.56
388+
#> [25] otel_0.2.0 viridisLite_0.4.3 cli_3.6.5
389+
#> [28] magrittr_2.0.4 network_1.20.0 digest_0.6.39
390+
#> [31] grid_4.5.3 lifecycle_1.0.5 vctrs_0.7.2
391+
#> [34] SparseM_1.84-2 sna_2.8 evaluate_1.0.5
392+
#> [37] glue_1.8.0 rmarkdown_2.31 tools_4.5.3
393+
#> [40] pkgconfig_2.0.3 networkDynamic_0.11.5 htmltools_0.5.9
394394
```
395395

396396
## To-do list

cleanup

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

0 commit comments

Comments
 (0)