[Stacomir-commits] r563 - in pkg/stacomir: . R tests tests/testthat

[noreply at r-forge.r-project.org]

Author: briand
Date: 2020-04-02 09:04:33 +0200 (Thu, 02 Apr 2020)
New Revision: 563

Modified:
   pkg/stacomir/DESCRIPTION
   pkg/stacomir/NAMESPACE
   pkg/stacomir/NEWS.md
   pkg/stacomir/R/report_silver_eel.R
   pkg/stacomir/tests/testthat.R
   pkg/stacomir/tests/testthat/test-00-stacomir.R
Log:
bug fixes

Modified: pkg/stacomir/DESCRIPTION
===================================================================
--- pkg/stacomir/DESCRIPTION	2020-03-13 07:46:42 UTC (rev 562)
+++ pkg/stacomir/DESCRIPTION	2020-04-02 07:04:33 UTC (rev 563)
@@ -1,6 +1,6 @@
 Package: stacomiR
-Version: 0.5.4.3
-Date: 2020-03-04
+Version: 0.5.4.4
+Date: 2020-04-02
 Title: Fish Migration Monitoring
 Authors at R: c(person("Cedric", "Briand", role = c("aut", "cre"), email = "cedric.briand00 at gmail.com"),
 	      person("Marion", "Legrand", role = "aut", email="tableau-salt-loire at logrami.fr"),

Modified: pkg/stacomir/NAMESPACE
===================================================================
--- pkg/stacomir/NAMESPACE	2020-03-13 07:46:42 UTC (rev 562)
+++ pkg/stacomir/NAMESPACE	2020-04-02 07:04:33 UTC (rev 563)
@@ -51,6 +51,7 @@
 import(RColorBrewer)
 import(RGtk2)
 import(RODBC)
+import(rlang)
 import(RPostgreSQL)
 import(gWidgets)
 import(gWidgetsRGtk2)

Modified: pkg/stacomir/NEWS.md
===================================================================
--- pkg/stacomir/NEWS.md	2020-03-13 07:46:42 UTC (rev 562)
+++ pkg/stacomir/NEWS.md	2020-04-02 07:04:33 UTC (rev 563)
@@ -1,7 +1,11 @@
 # stacomiR 0.5.4.XXX
 
+## Minor improvement and bug fix
+* added import to package  `rlang` 
+* Change to adapt to new dplyr format `dplyr:n()` instead of `n()` see dplyr breaking change in version 1.0.0
 
 
+
 # stacomiR 0.5.4.3
 
 

Modified: pkg/stacomir/R/report_silver_eel.R
===================================================================
--- pkg/stacomir/R/report_silver_eel.R	2020-03-13 07:46:42 UTC (rev 562)
+++ pkg/stacomir/R/report_silver_eel.R	2020-04-02 07:04:33 UTC (rev 563)
@@ -394,7 +394,7 @@
 	  if (plot.type=="2"){	
 		datdc1<-dplyr::select(datdc,ouv,annee,mois,stage)
 		datdc1<-dplyr::group_by(datdc1,ouv,annee,mois,stage)
-		datdc1<-dplyr::summarize(datdc1,N=n())
+		datdc1<-dplyr::summarize(datdc1,N=dplyr::n())
 		datdc1<-as.data.frame(datdc1)
 		# show.settings()
 		my.settings <- list(

Modified: pkg/stacomir/tests/testthat/test-00-stacomir.R
===================================================================
--- pkg/stacomir/tests/testthat/test-00-stacomir.R	2020-03-13 07:46:42 UTC (rev 562)
+++ pkg/stacomir/tests/testthat/test-00-stacomir.R	2020-04-02 07:04:33 UTC (rev 563)
@@ -160,7 +160,7 @@
 	  }					
 	})
 # test on current schema
-
+#  attention your may need superuser rights for that test (change baseODBC[2] and baseODBC[3]
 test_that("All foreign keys are present",
 	{
 	  skip_if_not(stacomi_installed(),"skipping as the program is not installed on this computer")
@@ -168,8 +168,8 @@
 	  req<-new("RequeteODBC")
 	  baseODBC<-get("baseODBC", envir=envir_stacomi)
       # ATTENTION local user may not have the rights to  connect information schema
-      # baseODBC[2] <- userlocal
-      # baseODBC[3] <- passwordlocal
+    # baseODBC[2] <- userlocal
+    # baseODBC[3] <- passwordlocal
 	  options(warn=-1)
 	  #warning : Coercing LHS to a list	 	
 	  options(warn=0)

Modified: pkg/stacomir/tests/testthat.R
===================================================================
--- pkg/stacomir/tests/testthat.R	2020-03-13 07:46:42 UTC (rev 562)
+++ pkg/stacomir/tests/testthat.R	2020-04-02 07:04:33 UTC (rev 563)
@@ -2,7 +2,7 @@
 #install.packages("relax")
 library(testthat)
 library(stacomiR)
-
+library(rlang)
 #getUsername <- function(){
 #  name <- Sys.info()[["user"]]
 #  return(name)