Skip to content

Commit

Permalink
Going to CRAN with v0.6.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
rorynolan committed Jul 8, 2019
1 parent 56fd5b3 commit b8e2597
Show file tree
Hide file tree
Showing 55 changed files with 586 additions and 89 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: detrendr
Type: Package
Title: Detrend Images
Version: 0.6.3
Version: 0.6.4
Authors@R: c(
person("Rory", "Nolan", email = "rorynoolan@gmail.com",
role = c("aut", "cre"),
Expand Down Expand Up @@ -36,7 +36,7 @@ Imports:
doParallel,
iterators,
purrr,
ijtiff (>= 2.0.0),
ijtiff (>= 2.0.2),
autothresholdr (>= 1.3.3),
rlang (>= 0.3.3),
stringr (>= 1.2.0),
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# `detrendr` 0.6.4

## BUG FIXES
* Insist on latest, bug-fixed `ijtiff` v2.0.2.


# `detrendr` 0.6.3

## BUG FIXES
Expand Down
6 changes: 3 additions & 3 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"issueTracker": "https://www.github.com/rorynolan/detrendr/issues",
"license": "https://spdx.org/licenses/BSD-3-Clause",
"version": "0.6.3",
"version": "0.6.4",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
Expand Down Expand Up @@ -377,7 +377,7 @@
"@type": "SoftwareApplication",
"identifier": "ijtiff",
"name": "ijtiff",
"version": ">= 2.0.0",
"version": ">= 2.0.2",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -545,7 +545,7 @@
],
"releaseNotes": "https://github.com/rorynolan/detrendr/blob/master/NEWS.md",
"readme": "https://github.com/rorynolan/detrendr/blob/master/README.md",
"fileSize": "525.439KB",
"fileSize": "526.52KB",
"contIntegration": [
"https://travis-ci.org/rorynolan/detrendr",
"https://ci.appveyor.com/project/rorynolan/detrendr",
Expand Down
4 changes: 2 additions & 2 deletions revdep/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
|collate |en_GB.UTF-8 |
|ctype |en_GB.UTF-8 |
|tz |Europe/London |
|date |2019-06-21 |
|date |2019-07-08 |

# Dependencies

|package |old |new |Δ |
|:--------|:-----|:-----|:--|
|detrendr |0.6.2 |0.6.2 |NA |
|detrendr |0.6.3 |0.6.4 |* |

# Revdeps

2 changes: 1 addition & 1 deletion revdep/checks.noindex/libraries.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
package,old,new,delta
detrendr,0.6.2,0.6.2,
detrendr,0.6.3,0.6.4,*
Binary file removed revdep/checks.noindex/nandb/nandb_2.0.2.tar.gz
Binary file not shown.
Binary file added revdep/checks.noindex/nandb/nandb_2.0.3.tar.gz
Binary file not shown.
29 changes: 15 additions & 14 deletions revdep/checks.noindex/nandb/new/libraries.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Library: /Users/rnolan/Dropbox/DPhil/Misc/RStuff/detrendr/revdep/library.noindex/detrendr/new
detrendr (0.6.2)
detrendr (0.6.4)

Library: /Users/rnolan/Dropbox/DPhil/Misc/RStuff/detrendr/revdep/library.noindex/nandb
abind (1.4-5)
askpass (1.1)
assertthat (0.2.1)
autothresholdr (1.3.3)
autothresholdr (1.3.4)
backports (1.1.4)
base64enc (0.1-3)
BBmisc (1.11)
BH (1.69.0-1)
checkmate (1.9.3)
checkmate (1.9.4)
cli (1.1.0)
clipr (0.6.0)
codetools (0.2-16)
Expand All @@ -19,12 +19,13 @@ commonmark (1.7)
covr (3.2.1)
crayon (1.3.4)
curl (3.3)
digest (0.6.19)
digest (0.6.20)
doParallel (1.0.14)
dplyr (0.8.1)
dplyr (0.8.3)
ellipsis (0.2.0.1)
evaluate (0.14)
fansi (0.4.0)
filesstrings (3.1.4)
filesstrings (3.1.5)
foreach (1.4.4)
fs (1.3.1)
ggplot2 (3.2.0)
Expand All @@ -36,7 +37,7 @@ hms (0.4.2)
htmltools (0.3.6)
httr (1.4.0)
hunspell (3.0)
ijtiff (2.0.0)
ijtiff (2.0.2)
iterators (1.0.10)
jsonlite (1.6)
knitr (1.23)
Expand All @@ -55,42 +56,42 @@ nlme (3.1-140)
openssl (1.4)
ore (1.6.2)
pacman (0.5.1)
pillar (1.4.1)
pillar (1.4.2)
pkgconfig (2.0.2)
plogr (0.2.0)
plyr (1.8.4)
praise (1.0.0)
processx (3.3.1)
processx (3.4.0)
ps (1.3.0)
purrr (0.3.2)
R6 (2.4.0)
RColorBrewer (1.1-2)
Rcpp (1.0.1)
RcppParallel (4.4.3)
readr (1.3.1)
remotes (2.0.4)
remotes (2.1.0)
reshape2 (1.4.3)
rex (1.1.2)
rlang (0.3.4)
rlang (0.4.0)
rmarkdown (1.13)
scales (1.0.0)
sigmoid (0.3.0)
spelling (2.1)
strex (1.1.0)
strex (1.1.1)
stringi (1.4.3)
stringr (1.4.0)
sys (3.2)
testthat (2.1.1)
tibble (2.1.3)
tidyr (0.8.3)
tidyselect (0.2.5)
tinytex (0.13)
tinytex (0.14)
utf8 (1.1.4)
vctrs (0.1.0)
viridis (0.5.1)
viridisLite (0.3.0)
withr (2.1.2)
xfun (0.7)
xfun (0.8)
xml2 (1.2.0)
yaml (2.2.0)
zeallot (0.1.0)
8 changes: 3 additions & 5 deletions revdep/checks.noindex/nandb/new/nandb.Rcheck/00check.log
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* using options ‘--no-manual --no-build-vignettes’
* checking for file ‘nandb/DESCRIPTION’ ... OK
* checking extension type ... Package
* this is package ‘nandb’ version ‘2.0.2
* this is package ‘nandb’ version ‘2.0.3
* package encoding: UTF-8
* checking package namespace information ... OK
* checking package dependencies ... OK
Expand All @@ -31,9 +31,7 @@
* checking whether the package can be unloaded cleanly ... OK
* checking whether the namespace can be loaded with stated dependencies ... OK
* checking whether the namespace can be unloaded cleanly ... OK
* checking dependencies in R code ... NOTE
Namespace in Imports field not imported from: ‘utils’
All declared Imports should be used.
* checking dependencies in R code ... OK
* checking S3 generic/method consistency ... OK
* checking replacement functions ... OK
* checking foreign function calls ... OK
Expand Down Expand Up @@ -61,4 +59,4 @@ Namespace in Imports field not imported from: ‘utils’
* checking running R code from vignettes ... NONE
* checking re-building of vignette outputs ... SKIPPED
* DONE
Status: 1 NOTE
Status: OK
2 changes: 1 addition & 1 deletion revdep/checks.noindex/nandb/new/nandb.Rcheck/nandb-Ex.Rout
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ integer type. Reading 1 channel and 50 frames . . .
> cleanEx()
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 7.045 0.5 8.111 0.117 0.107
Time elapsed: 7.124 0.47 8.162 0.101 0.102
> grDevices::dev.off()
null device
1
Expand Down
Binary file modified revdep/checks.noindex/nandb/new/nandb.Rcheck/nandb-Ex.pdf
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ All Done!
>
> proc.time()
user system elapsed
1.173 0.389 1.558
1.326 0.259 1.634
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Type 'q()' to quit R.
> library(nandb)
>
> test_check("nandb")
══ testthat results ════════════════════════════════════════════════════════════════════════════
══ testthat results ════════════════════════════════════════════════════════════════════════════
OK: 155 SKIPPED: 0 WARNINGS: 0 FAILED: 0
>
> proc.time()
user system elapsed
43.466 14.025 58.774
43.719 14.481 60.187
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,16 @@ test_that("number_timeseries works", {
c("auto=0", "auto=5029"),
c("auto=5363", "auto=0")
) # rhub ubuntu
ans5 <- stringr::str_replace(
ans0,
c("auto=0", "auto=5029"),
c("auto=574", "auto=0")
) # CRAN solaris
ans6 <- stringr::str_replace(
ans0,
c("auto=0", "auto=5029"),
c("auto=5214", "auto=0")
) # CRAN Windows oldrel
lfnts <- list.files("number_timeseries")
if (all(lfnts %in% ans0)) {
expect_true(all(lfnts %in% ans0))
Expand All @@ -236,10 +246,14 @@ test_that("number_timeseries works", {
expect_true(all(lfnts %in% ans3))
} else if (all(lfnts %in% ans4)) {
expect_true(all(lfnts %in% ans4))
} else if (all(lfnts %in% ans5)) {
expect_true(all(lfnts %in% ans5))
} else if (all(lfnts %in% ans6)) {
expect_true(all(lfnts %in% ans6))
} else {
expect_equal(sort(lfnts), sort(ans0))
}
suppressWarnings(file.remove(list.files())) # cleanup
suppressWarnings(file.remove(list.files(pattern = "\\.tiff*"))) # cleanup
filesstrings::dir.remove("number_timeseries", "tempwithintemp")
setwd(cwd)
})
29 changes: 15 additions & 14 deletions revdep/checks.noindex/nandb/old/libraries.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Library: /Users/rnolan/Dropbox/DPhil/Misc/RStuff/detrendr/revdep/library.noindex/detrendr/old
detrendr (0.6.2)
detrendr (0.6.3)

Library: /Users/rnolan/Dropbox/DPhil/Misc/RStuff/detrendr/revdep/library.noindex/nandb
abind (1.4-5)
askpass (1.1)
assertthat (0.2.1)
autothresholdr (1.3.3)
autothresholdr (1.3.4)
backports (1.1.4)
base64enc (0.1-3)
BBmisc (1.11)
BH (1.69.0-1)
checkmate (1.9.3)
checkmate (1.9.4)
cli (1.1.0)
clipr (0.6.0)
codetools (0.2-16)
Expand All @@ -19,12 +19,13 @@ commonmark (1.7)
covr (3.2.1)
crayon (1.3.4)
curl (3.3)
digest (0.6.19)
digest (0.6.20)
doParallel (1.0.14)
dplyr (0.8.1)
dplyr (0.8.3)
ellipsis (0.2.0.1)
evaluate (0.14)
fansi (0.4.0)
filesstrings (3.1.4)
filesstrings (3.1.5)
foreach (1.4.4)
fs (1.3.1)
ggplot2 (3.2.0)
Expand All @@ -36,7 +37,7 @@ hms (0.4.2)
htmltools (0.3.6)
httr (1.4.0)
hunspell (3.0)
ijtiff (2.0.0)
ijtiff (2.0.2)
iterators (1.0.10)
jsonlite (1.6)
knitr (1.23)
Expand All @@ -55,42 +56,42 @@ nlme (3.1-140)
openssl (1.4)
ore (1.6.2)
pacman (0.5.1)
pillar (1.4.1)
pillar (1.4.2)
pkgconfig (2.0.2)
plogr (0.2.0)
plyr (1.8.4)
praise (1.0.0)
processx (3.3.1)
processx (3.4.0)
ps (1.3.0)
purrr (0.3.2)
R6 (2.4.0)
RColorBrewer (1.1-2)
Rcpp (1.0.1)
RcppParallel (4.4.3)
readr (1.3.1)
remotes (2.0.4)
remotes (2.1.0)
reshape2 (1.4.3)
rex (1.1.2)
rlang (0.3.4)
rlang (0.4.0)
rmarkdown (1.13)
scales (1.0.0)
sigmoid (0.3.0)
spelling (2.1)
strex (1.1.0)
strex (1.1.1)
stringi (1.4.3)
stringr (1.4.0)
sys (3.2)
testthat (2.1.1)
tibble (2.1.3)
tidyr (0.8.3)
tidyselect (0.2.5)
tinytex (0.13)
tinytex (0.14)
utf8 (1.1.4)
vctrs (0.1.0)
viridis (0.5.1)
viridisLite (0.3.0)
withr (2.1.2)
xfun (0.7)
xfun (0.8)
xml2 (1.2.0)
yaml (2.2.0)
zeallot (0.1.0)
8 changes: 3 additions & 5 deletions revdep/checks.noindex/nandb/old/nandb.Rcheck/00check.log
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* using options ‘--no-manual --no-build-vignettes’
* checking for file ‘nandb/DESCRIPTION’ ... OK
* checking extension type ... Package
* this is package ‘nandb’ version ‘2.0.2
* this is package ‘nandb’ version ‘2.0.3
* package encoding: UTF-8
* checking package namespace information ... OK
* checking package dependencies ... OK
Expand All @@ -31,9 +31,7 @@
* checking whether the package can be unloaded cleanly ... OK
* checking whether the namespace can be loaded with stated dependencies ... OK
* checking whether the namespace can be unloaded cleanly ... OK
* checking dependencies in R code ... NOTE
Namespace in Imports field not imported from: ‘utils’
All declared Imports should be used.
* checking dependencies in R code ... OK
* checking S3 generic/method consistency ... OK
* checking replacement functions ... OK
* checking foreign function calls ... OK
Expand Down Expand Up @@ -61,4 +59,4 @@ Namespace in Imports field not imported from: ‘utils’
* checking running R code from vignettes ... NONE
* checking re-building of vignette outputs ... SKIPPED
* DONE
Status: 1 NOTE
Status: OK
2 changes: 1 addition & 1 deletion revdep/checks.noindex/nandb/old/nandb.Rcheck/nandb-Ex.Rout
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ integer type. Reading 1 channel and 50 frames . . .
> cleanEx()
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 6.483 0.471 8.104 0.111 0.101
Time elapsed: 7.156 0.487 8.656 0.097 0.092
> grDevices::dev.off()
null device
1
Expand Down
Binary file modified revdep/checks.noindex/nandb/old/nandb.Rcheck/nandb-Ex.pdf
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ All Done!
>
> proc.time()
user system elapsed
1.122 0.387 1.512
1.301 0.255 1.570
Loading

0 comments on commit b8e2597

Please sign in to comment.