merge

Merge branch 'master' of https://github.com/loelschlaeger/oeli # Conflicts: # NEWS.md
loelschlaeger · Jan 15, 2024 · 815abcb · 815abcb
2 parents 265b0ad + f01810f
commit 815abcb
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 0.3.1
-Date: 2023-12-08 06:58:24 UTC
-SHA: fbb553fd0363117d4b4bbf3770dcf50c7ae08a24
+Version: 0.3.2
+Date: 2024-01-14 16:25:34 UTC
+SHA: 5de6c6061f4c2a038ce688a430513e6109e82988
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: oeli
 Type: Package
 Title: My Utilities for Developing Data Science Software
-Version: 0.3.1.9000
+Version: 0.3.2
 Authors@R: c(
     person("Lennart", "Oelschl\u00e4ger", 
            email = "oelschlaeger.lennart@gmail.com", 

diff --git a/NEWS.md b/NEWS.md
@@ -1,9 +1,13 @@
 # oeli development
 
-* Fixed bug in `function_arguments()`.
-
 * Fixed bug in checks for matrices by checking for `NA`, `NaN` and infinite values.
 
+* Incrementing RoxygenNote to 7.3.0.
+
+# oeli 0.3.2
+
+* Fixed bug in `function_arguments()`.
+
 # oeli 0.3.1
 
 * Fixed https://github.com/RcppCore/Rcpp/issues/1287.

diff --git a/R/dictionary_helpers.R b/R/dictionary_helpers.R
@@ -42,11 +42,10 @@ Dictionary <- R6::R6Class(
     #' initializing a \code{Dictionary} object
     #' @return
     #' a new \code{Dictionary} object
-    initialize = function(
-        key_name, alias_name = NULL, value_names = character(),
-        value_assert = alist(), allow_overwrite = TRUE,
-        keys_reserved = character(), alias_choices = NULL,
-        dictionary_name = NULL) {
+    initialize = function(key_name, alias_name = NULL, value_names = character(),
+                          value_assert = alist(), allow_overwrite = TRUE,
+                          keys_reserved = character(), alias_choices = NULL,
+                          dictionary_name = NULL) {
       checkmate::assert_string(key_name)
       checkmate::assert_string(alias_name, null.ok = TRUE)
       checkmate::assert_character(

diff --git a/cran-comments.md b/cran-comments.md
@@ -1 +0,0 @@
-Fixed the problems shown on <https://cran.r-project.org/web/checks/check_results_oeli.html>.

diff --git a/renv.lock b/renv.lock
@@ -1,6 +1,6 @@
 {
   "R": {
-    "Version": "4.2.2",
+    "Version": "4.3.0",
     "Repositories": [
       {
         "Name": "CRAN",

diff --git a/tests/testthat/test-function_helpers.R b/tests/testthat/test-function_helpers.R
@@ -25,7 +25,7 @@ test_that("names of function arguments can be extracted", {
     function_arguments(f, with_ellipsis = FALSE),
     character()
   )
-  f <- function (x, a = 20, b = 0.2, c = 2 * pi) {
+  f <- function(x, a = 20, b = 0.2, c = 2 * pi) {
     -a * exp(-b * sqrt(mean(x^2))) - exp(mean(cos(c * x))) +
       a + exp(1)
   }