v0.6.0

DanChaltiel · Mar 27, 2023 · 51689eb · 51689eb
1 parent 1eb54c9
commit 51689eb
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 31 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -0,0 +1,3 @@
+Version: 0.6.0
+Date: 2023-03-26 18:53:52 UTC
+SHA: 1eb54c938cf2dbe9fb2cdcde74bea728f5c693a7
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: crosstable
 Title: Crosstables for Descriptive Analyses
-Version: 0.5.0.9018
+Version: 0.6.0
 Authors@R: 
     c(person(given = "Dan",
              family = "Chaltiel",
@@ -53,6 +53,7 @@ Suggests:
     stringi,
     survival,
     systemfonts,
+    tidyselect,
     testthat (>= 3.0.0),
     withr,
     waldo

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,6 @@
 Crosstables for descriptive analyses. See documentation at <https://danchaltiel.github.io/crosstable/> and browse code at <https://github.com/DanChaltiel/crosstable>.
 
-# crosstable 0.6.0 <sub><sup>(?)</sup></sub>
+# crosstable 0.6.0 <sub><sup>2023-03-26</sup></sub>
 
 #### New features
 

diff --git a/codemeta.json b/codemeta.json
@@ -8,13 +8,13 @@
   "codeRepository": "https://github.com/DanChaltiel/crosstable/",
   "issueTracker": "https://github.com/DanChaltiel/crosstable/issues/",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.4.1.9012",
+  "version": "0.6.0",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
     "url": "https://r-project.org"
   },
-  "runtimePlatform": "R version 4.2.1 (2022-06-23 ucrt)",
+  "runtimePlatform": "R version 4.1.3 (2022-03-10)",
   "provider": {
     "@id": "https://cran.r-project.org",
     "@type": "Organization",
@@ -388,6 +388,11 @@
       "sameAs": "https://CRAN.R-project.org/package=lifecycle"
     },
     "9": {
+      "@type": "SoftwareApplication",
+      "identifier": "methods",
+      "name": "methods"
+    },
+    "10": {
       "@type": "SoftwareApplication",
       "identifier": "officer",
       "name": "officer",
@@ -400,7 +405,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=officer"
     },
-    "10": {
+    "11": {
       "@type": "SoftwareApplication",
       "identifier": "purrr",
       "name": "purrr",
@@ -412,11 +417,11 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=purrr"
     },
-    "11": {
+    "12": {
       "@type": "SoftwareApplication",
       "identifier": "rlang",
       "name": "rlang",
-      "version": ">= 0.4.7",
+      "version": ">= 1.0.0",
       "provider": {
         "@id": "https://cran.r-project.org",
         "@type": "Organization",
@@ -425,12 +430,12 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=rlang"
     },
-    "12": {
+    "13": {
       "@type": "SoftwareApplication",
       "identifier": "stats",
       "name": "stats"
     },
-    "13": {
+    "14": {
       "@type": "SoftwareApplication",
       "identifier": "stringr",
       "name": "stringr",
@@ -442,7 +447,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=stringr"
     },
-    "14": {
+    "15": {
       "@type": "SoftwareApplication",
       "identifier": "tibble",
       "name": "tibble",
@@ -454,7 +459,7 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=tibble"
     },
-    "15": {
+    "16": {
       "@type": "SoftwareApplication",
       "identifier": "tidyr",
       "name": "tidyr",
@@ -466,21 +471,9 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=tidyr"
     },
-    "16": {
-      "@type": "SoftwareApplication",
-      "identifier": "tidyselect",
-      "name": "tidyselect",
-      "provider": {
-        "@id": "https://cran.r-project.org",
-        "@type": "Organization",
-        "name": "Comprehensive R Archive Network (CRAN)",
-        "url": "https://cran.r-project.org"
-      },
-      "sameAs": "https://CRAN.R-project.org/package=tidyselect"
-    },
     "SystemRequirements": null
   },
-  "fileSize": "1505.19KB",
+  "fileSize": "1502.912KB",
   "releaseNotes": "https://github.com/DanChaltiel/crosstable/blob/master/NEWS.md",
   "readme": "https://github.com/DanChaltiel/crosstable/blob/main/README.md",
   "contIntegration": ["https://app.codecov.io/gh/DanChaltiel/crosstable?branch=main", "https://github.com/DanChaltiel/crosstable/actions"],

diff --git a/cran-comments.md b/cran-comments.md
@@ -6,11 +6,17 @@
 * check_win_devel()
 
 
-
 ## R CMD check results
 
-There were no ERROR, WARNING or NOTE.
-
+On RHub (Windows Server 2022, R-devel), there was one error about "Graphics API version mismatch" that seems to be a false positive.
+
+Everything I could read about this problem on stackoverflow is about installation problems, 
+which seems odd considering a platform such as RHub.
+
+There are no problems locally, with other RHub platforms, or with check_win_devel().
+
+Thank you very much.
+
 
 ## Comment
 

diff --git a/man/figures/ct1.png b/man/figures/ct1.png
diff --git a/man/figures/ct2.png b/man/figures/ct2.png
diff --git a/tests/testthat/_snaps/labels.md b/tests/testthat/_snaps/labels.md
@@ -65,3 +65,28 @@
        "foo" "ffoo" 
       
 
+# clean_names_with_labels
+
+    Code
+      x = data.frame(`name with space` = 1, TwoWords = 1, `total $ (2009)` = 1,
+        àccénts = 1, check.names = FALSE)
+      cleaned = clean_names_with_labels(x)
+      names(cleaned)
+    Output
+      [1] "name_with_space" "twowords"        "total_2009"      "accents"        
+    Code
+      get_label(cleaned)
+    Output
+        name_with_space          twowords        total_2009           accents 
+      "name with space"        "TwoWords"  "total $ (2009)"         "àccénts" 
+    Code
+      cleaned = clean_names_with_labels(x, except = "name with space")
+      names(cleaned)
+    Output
+      [1] "name with space" "twowords"        "total_2009"      "accents"        
+    Code
+      get_label(cleaned)
+    Output
+        name with space          twowords        total_2009           accents 
+      "name with space"        "TwoWords"  "total $ (2009)"         "àccénts" 
+
diff --git a/tests/testthat/test-labels.R b/tests/testthat/test-labels.R
@@ -194,12 +194,17 @@ test_that("Save/import", {
 
 
 test_that("clean_names_with_labels", {
+  skip_on_cran()
+  expect_snapshot({
   x = data.frame("name with space"=1, TwoWords=1, "total $ (2009)"=1, "àccénts"=1,
                  check.names=FALSE)
-  cleaned = clean_names_with_labels(x, except=TwoWords)
-  expect_equal(names(cleaned), c("name_with_space", "TwoWords", "total_2009", "accents"))
-  expect_equal(get_label(cleaned), c(name_with_space = "name with space", TwoWords = "TwoWords",
-                                     total_2009 = "total $ (2009)", `accents` = "àccénts"))
+  cleaned = clean_names_with_labels(x)
+  names(cleaned)
+  get_label(cleaned)
+  cleaned = clean_names_with_labels(x, except="name with space")
+  names(cleaned)
+  get_label(cleaned)
+  })
 })