CRAN compatability fix

ropensci · Jun 23, 2014 · d5887e0 · d5887e0
1 parent 5f99eed
commit d5887e0
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 3 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -1,2 +1,4 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
+notes.R
+.~lock*
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -6,7 +6,6 @@ Date: 2014-06-12
 Author: Gerrit-Jan Schutten
 Maintainer: Gerrit-Jan Schutten <[email protected]>
 Contact: https://github.com/phonixor/readODS/
-Source: https://github.com/phonixor/readODS/
 Description: read ODS files and puts them into a list of data.frames unless a
     specific sheet is specified then it will be put into a normal data.frame.
 Depends:

diff --git a/NAMESPACE b/NAMESPACE
@@ -2,3 +2,4 @@
 
 export(getNrOfSheetsInODS)
 export(read.ods)
+import(XML)
diff --git a/R/readODS.R b/R/readODS.R
@@ -23,6 +23,7 @@ library(XML)
 #' @details 
 #' the data.frame contains all strings (not factors)
 #' 
+#' @import XML
 #' @export
 read.ods=function(file=NULL, sheet=NULL, formulaAsFormula=F){
   root=getODSRoot(file)

diff --git a/readODS.Rproj b/readODS.Rproj
@@ -13,6 +13,7 @@ RnwWeave: Sweave
 LaTeX: pdfLaTeX
 
 BuildType: Package
+PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
 PackageCheckArgs: --as-cran
 PackageRoxygenize: rd,collate,namespace
diff --git a/tests/testdata/.~lock.multisheet.ods# b/tests/testdata/.~lock.multisheet.ods#
diff --git a/...readODS test file google docs created.ods → ...data/readODStestfilegoogledocscreated.ods b/...readODS test file google docs created.ods → ...data/readODStestfilegoogledocscreated.ods
diff --git a/tests/testthat/test_readODS.R b/tests/testthat/test_readODS.R
@@ -15,7 +15,7 @@ test_that("getNrOfSheetsInODS", {
   expect_equal(getNrOfSheetsInODS(file),4)
   file=paste("../testdata/sum.ods",sep="")
   expect_equal(getNrOfSheetsInODS(file),1)
-  file=paste("../testdata/readODS test file google docs created.ods",sep="")
+  file=paste("../testdata/readODStestfilegoogledocscreated.ods",sep="")
   expect_equal(getNrOfSheetsInODS(file),4)
 #   expect_equal(getNrOfSheetsInODS(file),3) # CRASH!!!
 })
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@

		export(getNrOfSheetsInODS)
		export(read.ods)
		import(XML)