version 0.2.4

cran · Aug 2, 2021 · 9de79d6 · 9de79d6
1 parent 070d4d6
commit 9de79d6
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 25 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: sparrpowR
 Title: Power Analysis to Detect Spatial Relative Risk Clusters
-Version: 0.2.3
-Date: 2021-07-15
+Version: 0.2.4
+Date: 2021-08-02
 Authors@R: 
     c(person(given = "Ian D.",
              family = "Buller",
@@ -45,11 +45,11 @@ Language: en-US
 URL: https://github.com/machiela-lab/sparrpowR
 BugReports: https://github.com/machiela-lab/sparrpowR/issues
 NeedsCompilation: no
-Packaged: 2021-07-15 15:07:05 UTC; bullerid
+Packaged: 2021-08-02 19:50:20 UTC; bullerid
 Author: Ian D. Buller [aut, cre, cph] (<https://orcid.org/0000-0001-9477-8582>),
   Derek W. Brown [aut, cph] (<https://orcid.org/0000-0001-8393-1713>),
   Mitchell J. Machiela [ctb] (<https://orcid.org/0000-0001-6538-9705>),
   Timothy A. Myers [ctb],
   NCI [cph, fnd]
 Repository: CRAN
-Date/Publication: 2021-07-16 07:30:02 UTC
+Date/Publication: 2021-08-02 20:20:02 UTC
diff --git a/MD5 b/MD5
@@ -1,6 +1,6 @@
-a20f1baa561c0d2418de70f345c8c57c *DESCRIPTION
+51c7a80554a4b17c77a1021ebca79c47 *DESCRIPTION
 9fb7f7c0b26d73432d3ea260410d8ace *NAMESPACE
-88076da6b58d6a8c006b24fdfe848460 *NEWS.md
+91044d74a4d268925bd90cc06d055ecf *NEWS.md
 f4bbfea1c535c9a87632199c12e1da8a *R/globals.R
 29d0c29a9e153bd1c411ca326c0ad610 *R/jitter_power.R
 fffcf16a83d30204cda9cc8d5e2de3a4 *R/package.R
@@ -11,7 +11,7 @@ d33dba086231ad26c64996ca8080b6a1 *R/spatial_power.R
 0437c204f4beddb97c3935bf16ff399f *R/utils.R
 7c3d9c1a0bed7dd867122eedcaba2ecb *R/zzz.R
 175441a235a7615722681b3a65599f8b *README.md
-3f0e5b30a05cc13c2997f838f8527bf2 *build/partial.rdb
+c7ed5da170fd04c16c7ae9669430cad5 *build/partial.rdb
 f4b6bb68341cc25b3e32211a532f4746 *build/vignette.rds
 58b3810baff94976fbabfeda07259517 *inst/CITATION
 63f8b1c69a0a806ebee0fc6dc955755f *inst/doc/vignette.html
@@ -30,10 +30,10 @@ d5a92a4791a93f08dd369ef778801e59 *man/spatial_data.Rd
 7451a530216af7ce79122431437c449b *man/spatial_plots.Rd
 df8c009c180445e8679ac358464a4da9 *man/spatial_power.Rd
 0622a97a2aaa3c342f09636052c2d7f5 *tests/spelling.R
-0ee18a57299658c9a062ae1d95a5ba6f *tests/testthat.R
-8b4431872d32594d99e34e5a145bb3ea *tests/testthat/test-jitter_power.R
+4a2093391fef1301f8d6f885c68fb28e *tests/testthat.R
+8bbe46bab7a748e2788cda4f35dd0fd2 *tests/testthat/test-jitter_power.R
 09d7ad2f66e758676a938ad5e805ffcd *tests/testthat/test-test-spatial_data.R
 c9d60cf0d54dfedd221272af9e5fa5ae *tests/testthat/test-test-spatial_plots.R
-1b83b47aef6460ca2aa8dd4ff2f87c06 *tests/testthat/test-test-spatial_power.R
+d2f4744239e0a5a7a392c944a2e59b52 *tests/testthat/test-test-spatial_power.R
 430ecfc5a3fd434036dc77d673be8651 *vignettes/vignette.Rmd
 6f79a812c742950b89e776dd413f9b81 *vignettes/vignette.html.asis
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
 # sparrpowR (development version)
 
+# sparrpowR 0.2.4
+* Addressed ERROR on R-devel CRAN environments by setting `parallelly.makeNodePSOCK.setup_strategy = sequential` for all CRAN tests as suggested by the maintainer for the `future` and `parallelly` packages who is actively working on a solution <https://github.com/HenrikBengtsson/parallelly/issues/65>
+
 # sparrpowR 0.2.3
 * Following advice from `future` package maintainer, now `spatial_power()` and `jitter_power()` functions reset future strategy when exiting
 * Addressed ERROR in MacOS CRAN environments by setting the `parallelly.makeNodePSOCK.setup_strategy = sequential` for MacOS environments running `tcltk` until `parallelly` (>=1.26.1-9002) is on CRAN. This workaround was suggested by the `parallelly` maintainer <https://github.com/HenrikBengtsson/parallelly/issues/62#issuecomment-880665390>

diff --git a/build/partial.rdb b/build/partial.rdb
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -1,4 +1,9 @@
 library(testthat)
 library(sparrpowR)
 
+## WORKAROUND: Avoid R bug 18119 [1] that is trigger when for instance the
+## 'tcltk' package is loaded on macOS, or when running in the RStudio Console
+## [1] https://bugs.r-project.org/bugzilla/show_bug.cgi?id=18119
+options(parallelly.makeNodePSOCK.setup_strategy = "sequential")
+
 test_check("sparrpowR")
diff --git a/tests/testthat/test-jitter_power.R b/tests/testthat/test-jitter_power.R
@@ -62,13 +62,6 @@ test_that("jitter_power works", {
 }
 )
 
-## WORKAROUND: Avoid R bug 18119 [1] that is trigger when for instance the
-## 'tcltk' package is loaded on macOS, or when running in the RStudio Console
-## [1] https://bugs.r-project.org/bugzilla/show_bug.cgi?id=18119
-if (getRversion() >= "4.0.0" && getRversion() <= "4.1.0") {
-  options(parallelly.makeNodePSOCK.setup_strategy = "sequential")
-}
-
 test_that("parallel processing with future package functions properly", {
   expect_named(jitter_power(obs_data = unique(chorley),
                             sim_total = 2,

diff --git a/tests/testthat/test-test-spatial_power.R b/tests/testthat/test-test-spatial_power.R
@@ -194,13 +194,6 @@ test_that("spatial_power works", {
 }
 )
 
-## WORKAROUND: Avoid R bug 18119 [1] that is trigger when for instance the
-## 'tcltk' package is loaded on macOS, or when running in the RStudio Console
-## [1] https://bugs.r-project.org/bugzilla/show_bug.cgi?id=18119
-if (getRversion() >= "4.0.0" && getRversion() <= "4.1.0") {
-  options(parallelly.makeNodePSOCK.setup_strategy = "sequential")
-}
-
 test_that("parallel processing with future package functions properly", {
   expect_named(spatial_power(x_case = c(0.25),
                              x_control = c(0.25),
@@ -225,4 +218,3 @@ test_that("parallel processing with future package functions properly", {
   )
 }
 )
-