Skip to content

Commit

Permalink
Don't use require to avoid warning
Browse files Browse the repository at this point in the history
Update gh actions along the way.
  • Loading branch information
asardaes committed Jan 12, 2022
1 parent 0776974 commit e5b2b9f
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 51 deletions.
29 changes: 9 additions & 20 deletions .github/workflows/check-non-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,45 +32,34 @@ jobs:
steps:
- uses: actions/checkout@v2

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

- uses: r-lib/actions/setup-r@v1
- 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@v1
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck
extra-packages: |<
any::rcmdcheck
any::bigmemory
- uses: r-lib/actions/setup-tinytex@v1
- uses: r-lib/actions/setup-tinytex@v2

- name: Install Yihui packages
run: |
Rscript -e 'tinytex:::install_yihui_pkgs()'
- uses: r-lib/actions/check-r-package@v1
- uses: r-lib/actions/check-r-package@v2
with:
build_args: '"--compact-vignettes=both", "--no-manual"'
error-on: '"error"' # osx complains about vignette compaction
build_args: 'c("--compact-vignettes=both", "--no-manual")'
continue-on-error: ${{ matrix.config.r == 'devel' }}

- name: Show testthat output
if: always()
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Test coverage
if: runner.os == 'Linux' && matrix.config.r == 'release'
run: |
Rscript -e 'install.packages("covr")'
Rscript codecov.R
continue-on-error: true

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
2 changes: 1 addition & 1 deletion .github/workflows/check-sanitizers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
run: |
install.packages("remotes")
library("remotes")
install_cran(c("codetools", "Matrix", "lattice"))
install_cran(c("codetools", "Matrix", "lattice", "bigmemory"))
update(dev_package_deps(dependencies = TRUE))
- name: Check with sanitizers
Expand Down
29 changes: 9 additions & 20 deletions .github/workflows/check-standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,45 +31,34 @@ jobs:
steps:
- uses: actions/checkout@v2

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

- uses: r-lib/actions/setup-r@v1
- 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@v1
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck
extra-packages: |<
any::rcmdcheck
any::bigmemory
- uses: r-lib/actions/setup-tinytex@v1
- uses: r-lib/actions/setup-tinytex@v2

- name: Install Yihui packages
run: |
Rscript -e 'tinytex:::install_yihui_pkgs()'
- uses: r-lib/actions/check-r-package@v1
- uses: r-lib/actions/check-r-package@v2
with:
build_args: '"--compact-vignettes=both", "--no-manual"'
error-on: '"error"' # osx complains about vignette compaction
build_args: 'c("--compact-vignettes=both", "--no-manual")'
continue-on-error: ${{ matrix.config.r == 'devel' }}

- name: Show testthat output
if: always()
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Test coverage
if: runner.os == 'Linux' && matrix.config.r == 'release'
run: |
Rscript -e 'install.packages("covr")'
Rscript codecov.R
continue-on-error: true

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
12 changes: 7 additions & 5 deletions .github/workflows/check-valgrind.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,21 @@ jobs:
run: |
/usr/bin/sudo DEBIAN_FRONTEND=noninteractive apt-get install -y valgrind
- uses: r-lib/actions/setup-pandoc@v1
- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v1
- 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@v1
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck
extra-packages: |<
any::rcmdcheck
any::bigmemory
- uses: r-lib/actions/setup-tinytex@v1
- uses: r-lib/actions/setup-tinytex@v2

- name: Install Yihui packages
run: |
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Version 5.5.6.9000
* Series order is now preserved in plots of included shiny apps.
* The optimization in `sdtw_cent` now uses `stats::optim` by default.
* Dropped strong dependency on `bigmemory` in case it is archived. It will still be used if available.
* Dropped strong dependency on `bigmemory` in case it is archived. It can still be used if available.

## Version 5.5.6
* Adjustments for future R 4.0.0 version: matrices now also inherit from `array`.
Expand Down
2 changes: 1 addition & 1 deletion R/CLUSTERING-ddist2.R
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ ddist2 <- function(distance, control) {
if (is.null(centroids) && symmetric && !isTRUE(dots$pairwise)) {
multiple_workers <- foreach::getDoParWorkers() > 1L

if (multiple_workers && require("bigmemory", quietly = TRUE)) {
if (multiple_workers && isNamespaceLoaded("bigmemory")) {
# WHOLE SYMMETRIC DISTMAT IN PARALLEL
# Only half of it is computed
# proxy can do this if y = NULL, but not in parallel
Expand Down
3 changes: 2 additions & 1 deletion R/S4-tsclustFamily.R
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
#'
#' For distances *not* included in \pkg{dtwclust}, the symmetric, parallel case mentioned above
#' makes chunks for parallel workers, but they are not perfectly balanced, so some workers might
#' finish before the others.
#' finish before the others. You **must** load or attach the \pkg{bigmemory} package for this to
#' take place; see [base::library()] or [base::loadNamespace()].
#'
#' @section Centroid function:
#'
Expand Down
2 changes: 1 addition & 1 deletion inst/NEWS.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
\itemize{
\item Series order is now preserved in plots of included shiny apps.
\item The optimization in \code{sdtw_cent} now uses \code{stats::optim} by default.
\item Dropped strong dependency on \code{bigmemory} in case it is archived. It will still be used if available.
\item Dropped strong dependency on \code{bigmemory} in case it is archived. It can still be used if available.
}
}
3 changes: 2 additions & 1 deletion man/tsclustFamily-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e5b2b9f

Please sign in to comment.