Skip to content

Commit 876d93c

Browse files
authored
Merge pull request #96 from DeclareDesign/cran-patch-chunk-options
cran patch commit
2 parents 7c2262b + 46171c7 commit 876d93c

File tree

6 files changed

+27
-19
lines changed

6 files changed

+27
-19
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ CONDUCT.md
2222
^CRAN-RELEASE$
2323
^pkgdown$
2424
^\.github$
25+
^CRAN-SUBMISSION$

CRAN-SUBMISSION

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Version: 0.24.0
2+
Date: 2023-02-10 04:20:58 UTC
3+
SHA: 5b81c11b3cdea053efb7e6f3c5293bca2b9f36c7

DESCRIPTION

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Package: randomizr
22
Title: Easy-to-Use Tools for Common Forms of Random Assignment and Sampling
3-
Version: 0.23.0
3+
Version: 0.24.0
44
Authors@R: c(person("Alexander", "Coppock", email = "acoppock@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-5733-2386")),
55
person("Jasper", "Cooper", email = "jaspercooper@gmail.com", role = c("ctb"), comment = c(ORCID = "0000-0002-8639-3188")),
66
person("Neal", "Fultz", email = "nfultz@gmail.com", role = c("ctb"), comment = "C version of restricted partitions"),
7-
person("Graeme", "Blair", email = "graeme.blair@ucla.edu", role = c("ctb"), comment = c(ORCID = "0000-0001-9164-2102")))
7+
person("Graeme", "Blair", email = "graeme.blair@gmail.com", role = c("ctb"), comment = c(ORCID = "0000-0001-9164-2102")))
88
Description: Generates random assignments for common experimental designs and
99
random samples for common sampling designs.
1010
URL: https://declaredesign.org/r/randomizr/, https://github.com/DeclareDesign/randomizr
@@ -18,7 +18,6 @@ Suggests:
1818
knitr,
1919
dplyr,
2020
testthat,
21-
rmarkdown,
22-
ri
21+
rmarkdown
2322
VignetteBuilder: knitr
24-
RoxygenNote: 7.1.2
23+
RoxygenNote: 7.2.3

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# randomizr 0.24.0
2+
3+
* Documentation fix
4+
15
# randomizr 0.22.0
26

37
* Added a `NEWS.md` file to track changes to the package.

cran-comments.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
## Update randomizr to version 0.22.0
2-
* Remove suggests dependency of blockTools per Prof. Ripley email (the package was removed from CRAN)
3-
* Add Graeme Blair as a contributor
4-
* Small bug fixes
5-
* Added permutation support for random sampling functions
1+
## Update randomizr to version 0.24.0
2+
3+
Small update for new version of knitr. Change to email address for one contributor.
4+
5+
This is a resubmission to remove the suggests dependency of ri, which was removed from CRAN.
66

77
## Test environments
88
R version 4.1.2
@@ -12,9 +12,10 @@ R version 4.1.2
1212
* Linux, Mac OS via Github Actions
1313

1414
## R CMD check results
15+
1516
There were no ERRORs, WARNINGs, or NOTEs.
1617

1718
## Downstream dependencies
1819

19-
There is a change to worse in the reverse dependency DeclareDesign, but we have a patch prepared once this is accepted that will address that test failure. Thank you for your understanding. There are no other changes to worse.
20+
No changes to worse.
2021

tests/testthat/test-permutations.R

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -417,16 +417,16 @@ test_that("matches ri package", {
417417
mine <- obtain_permutation_matrix(declaration = declaration)
418418
rowMeans(mine) - declaration$probabilities_matrix[, 2]
419419

420-
theirs <- ri::genperms(df$Z, df$block, df$cluster)
420+
# theirs <- ri::genperms(df$Z, df$block, df$cluster)
421421

422422
expect_equal(anyDuplicated(mine, MARGIN = 2), 0)
423-
expect_equal(anyDuplicated(theirs, MARGIN = 2), 0)
424-
expect_identical(sort(apply(
425-
mine, 2, paste, sep = "", collapse = ""
426-
)),
427-
sort(apply(
428-
theirs, 2, paste, sep = "", collapse = ""
429-
)))
423+
# expect_equal(anyDuplicated(theirs, MARGIN = 2), 0)
424+
# expect_identical(sort(apply(
425+
# mine, 2, paste, sep = "", collapse = ""
426+
# )),
427+
# sort(apply(
428+
# theirs, 2, paste, sep = "", collapse = ""
429+
# )))
430430
})
431431

432432
# test big numbers

0 commit comments

Comments
 (0)