Merge pull request #115 from rsquaredacademy/develop

CRAN patch release
rsquaredacademy · Dec 9, 2020 · 9dd886b · 9dd886b
2 parents 3c8c3a5 + c9df8a4
commit 9dd886b
Show file tree

Hide file tree

Showing 207 changed files with 2,769 additions and 5,165 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,14 +1,14 @@
 Package: descriptr
 Type: Package
 Title: Generate Descriptive Statistics
-Version: 0.5.1.9000
+Version: 0.5.2
 Authors@R: person("Aravind", "Hebbali", email = "hebbali.aravind@gmail.com", role = c("aut", "cre"),
     comment = c(ORCID = "0000-0001-9220-9669"))
 Description: Generate descriptive statistics such as measures of location,
     dispersion, frequency tables, cross tables, group summaries and multiple
     one/two way tables. 
 Depends:
-    R(>= 3.2)
+    R(>= 3.3.0)
 Imports:
     dplyr,
     ggplot2,
@@ -33,4 +33,4 @@ BugReports: https://github.com/rsquaredacademy/descriptr/issues
 Encoding: UTF-8
 LazyData: true
 VignetteBuilder: knitr
-RoxygenNote: 7.1.0
+RoxygenNote: 7.1.1
diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,8 @@
-# descriptr 0.5.1.9000
+# descriptr 0.5.2
+
+This is a patch release to fix CRAN notification about vdiffr package 
+and remove deprecated functions related to visualization of 
+statistical distributions.
 
 ## Defunct
 

diff --git a/R/ds-data-hsb.R b/R/ds-data-hsb.R
@@ -18,6 +18,6 @@
 #'   \item{socst}{scores from test of social studies}
 #' }
 #'
-#' @source \url{http://www.ats.ucla.edu/stat/spss/whatstat/whatstat.htm}
+#' @source \url{https://nces.ed.gov/surveys/hsb/}
 #'
 "hsb"
diff --git a/R/ds-group-summary-interact.R b/R/ds-group-summary-interact.R
@@ -31,7 +31,7 @@ ds_group_summary_interact <- function(data, cvar, ...) {
                     paste("-", non_type, collapse = "\n"))
 
   if (length(non_type) > 0) {
-  	stop(error_message)
+        stop(error_message)
   }
 
   cats <- unlist(lapply(gdata, is.factor))

diff --git a/R/ds-summary-stats.R b/R/ds-summary-stats.R
@@ -51,7 +51,7 @@ ds_summary <- function(data, variable) UseMethod("ds_summary")
 
 ds_summary.default <- function(data, variable) {
 
-	check_df(data)
+  check_df(data)
   vary  <- rlang::enquo(variable)
   var_name <- deparse(substitute(variable))
   check_numeric(data, !! vary, var_name)
@@ -69,35 +69,35 @@ ds_summary.default <- function(data, variable) {
   high_val <- ds_rindex(sdata, high)
 
   result <- list(obs      = length(odata),
-    			 missing  = sum(is.na(odata)),
-			     avg      = mean(sdata),
-			     tavg     = mean(sdata, trim = 0.05),
-			     stdev    = stats::sd(sdata),
-			     variance = stats::var(sdata),
-			     skew     = ds_skewness(sdata),
-			     kurtosis = ds_kurtosis(sdata),
-			     uss      = stat_uss(sdata),
-			     css      = ds_css(sdata),
-			     cvar     = ds_cvar(sdata),
-			     sem      = ds_std_error(sdata),
-			     median   = stats::median(sdata),
-			     mode     = ds_mode(sdata),
-			     range    = ds_range(sdata),
-			     min      = min(sdata),
-			     Max      = max(sdata),
-			     iqrange  = stats::IQR(sdata),
-			     per99    = stats::quantile(sdata, 0.99),
-			     per90    = stats::quantile(sdata, 0.90),
-			     per95    = stats::quantile(sdata, 0.95),
-			     per75    = stats::quantile(sdata, 0.75),
-			     per25    = stats::quantile(sdata, 0.25),
-			     per10    = stats::quantile(sdata, 0.10),
-			     per5     = stats::quantile(sdata, 0.05),
-			     per1     = stats::quantile(sdata, 0.01),
-			     lowobs   = low,
-			     highobs  = high,
-			     lowobsi  = low_val,
-			     highobsi = high_val)
+           missing  = sum(is.na(odata)),
+           avg      = mean(sdata),
+           tavg     = mean(sdata, trim = 0.05),
+           stdev    = stats::sd(sdata),
+           variance = stats::var(sdata),
+           skew     = ds_skewness(sdata),
+           kurtosis = ds_kurtosis(sdata),
+           uss      = stat_uss(sdata),
+           css      = ds_css(sdata),
+           cvar     = ds_cvar(sdata),
+           sem      = ds_std_error(sdata),
+           median   = stats::median(sdata),
+           mode     = ds_mode(sdata),
+           range    = ds_range(sdata),
+           min      = min(sdata),
+           Max      = max(sdata),
+           iqrange  = stats::IQR(sdata),
+           per99    = stats::quantile(sdata, 0.99),
+           per90    = stats::quantile(sdata, 0.90),
+           per95    = stats::quantile(sdata, 0.95),
+           per75    = stats::quantile(sdata, 0.75),
+           per25    = stats::quantile(sdata, 0.25),
+           per10    = stats::quantile(sdata, 0.10),
+           per5     = stats::quantile(sdata, 0.05),
+           per1     = stats::quantile(sdata, 0.01),
+           lowobs   = low,
+           highobs  = high,
+           lowobsi  = low_val,
+           highobsi = high_val)
 
   class(result) <- "ds_summary"
   return(result)

diff --git a/README.Rmd b/README.Rmd
@@ -112,6 +112,3 @@ If you encounter a bug, please file a minimal reproducible example using
 [reprex](https://reprex.tidyverse.org/index.html) on github. For questions and 
 clarifications, use [StackOverflow](https://stackoverflow.com/).
 
-## Code of Conduct
-
-Please note that this project is released with a [Contributor Code of Conduct](CONDUCT.md). By participating in this project you agree to abide by its terms.
diff --git a/README.md b/README.md
@@ -245,9 +245,3 @@ If you encounter a bug, please file a minimal reproducible example using
 [reprex](https://reprex.tidyverse.org/index.html) on github. For
 questions and clarifications, use
 [StackOverflow](https://stackoverflow.com/).
-
-## Code of Conduct
-
-Please note that this project is released with a [Contributor Code of
-Conduct](CONDUCT.md). By participating in this project you agree to
-abide by its terms.
diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -25,8 +25,6 @@ navbar:
           href: articles/categorical-data.html
         - text: "Visualization"
           href: articles/visualization.html
-        - text: "Tests and Coverage"
-          href: articles/tests_and_coverage.html  
     - text: "Reference"
       menu:
         - text: "Functions"
@@ -42,10 +40,10 @@ home:
   links:
   - text: Learn more
     href: https://www.rsquaredacademy.com
-  - text: Shiny App
-    href: https://www.rsquaredcomputing.com/shiny/descriptr/
-  - text: Docker Image
-    href: https://hub.docker.com/r/rsquaredacademy/descriptr/
+  - text: Read our blog
+    href: https://blog.rsquaredacademy.com
+  - text: Our other R packages
+    href: https://pkgs.rsquaredacademy.com
 
 
 

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,6 +1,6 @@
 ## Test environments
-* local Windows 10, R 3.6.2
-* ubuntu 14.04 (on travis-ci), R 3.5.3, R 3.6.2, R-devel
+* local Windows 10, R 4.0.3
+* ubuntu 20.04 (on GitHub Actions), R 4.0.3, R-devel
 * win-builder (devel and release)
 
 ## R CMD check results

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CONDUCT.html b/docs/CONDUCT.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html