Permalink
Browse files

Updated for R 2.15

  • Loading branch information...
1 parent 20fb9aa commit 84f766f837079a2487be3d1454a92af24fbdac54 @johnmyleswhite committed May 13, 2012
Showing with 25 additions and 21 deletions.
  1. +5 −0 ChangeLog
  2. +2 −3 DESCRIPTION
  3. BIN ProjectTemplate_0.4-1.tar.gz → ProjectTemplate_0.4-2.tar.gz
  4. +1 −1 R/xlsx.reader.R
  5. +17 −17 tests/3.R
View
@@ -1,3 +1,8 @@
+2012-05-12 John Myles White <jmw@johnmyleswhite.com>
+
+* v0.4-2
+* Had to disable xlsx.reader temporarily because it does not build for 2.15.
+
2011-11-23 John Myles White <jmw@johnmyleswhite.com>
* v0.4-1
View
@@ -2,8 +2,8 @@ Package: ProjectTemplate
Type: Package
Title: Automates the creation of new statistical analysis
projects.
-Version: 0.4-1
-Date: 2011-11-23
+Version: 0.4-2
+Date: 2012-05-12
Author: John Myles White
Maintainer: John Myles White <jmw@johnmyleswhite.com>
Description: ProjectTemplate provides functions to
@@ -26,7 +26,6 @@ Suggests:
log4r,
RMySQL,
RSQLite,
- xlsx,
gdata,
RODBC,
tuneR,
Binary file not shown.
View
@@ -16,7 +16,7 @@
#' \dontrun{xlsx.reader('example.xlsx', 'data/example.xlsx', 'example')}
xlsx.reader <- function(data.file, filename, workbook.name)
{
- library('xlsx')
+ #library('xlsx')
wb <- loadWorkbook(filename)
sheets <- getSheets(wb)
View
@@ -433,23 +433,23 @@ expect_that(get(variable.name)[5, 2], equals(11))
rm(example.26.Sheet1)
# Example 27: Excel 2011 File with .xlsx Extension
-message('Example 27: Testing .xlsx support')
-data.file <- 'example_27.xlsx'
-filename <- file.path(system.file('example_data',
- package = 'ProjectTemplate'),
- 'example_27.xlsx')
-variable.name <- ProjectTemplate:::clean.variable.name('example_27')
-
-ProjectTemplate:::xlsx.reader(data.file, filename, variable.name)
-
-variable.name <- paste(variable.name, '.Sheet1', sep = '')
-
-expect_that(exists(variable.name), is_true())
-expect_that(names(get(variable.name)), equals(c('N', 'Prime')))
-expect_that(nrow(get(variable.name)), equals(5))
-expect_that(ncol(get(variable.name)), equals(2))
-expect_that(get(variable.name)[5, 2], equals(11))
-rm(example.27.Sheet1)
+#message('Example 27: Testing .xlsx support')
+#data.file <- 'example_27.xlsx'
+#filename <- file.path(system.file('example_data',
+# package = 'ProjectTemplate'),
+# 'example_27.xlsx')
+#variable.name <- ProjectTemplate:::clean.variable.name('example_27')
+#
+#ProjectTemplate:::xlsx.reader(data.file, filename, variable.name)
+#
+#variable.name <- paste(variable.name, '.Sheet1', sep = '')
+#
+#expect_that(exists(variable.name), is_true())
+#expect_that(names(get(variable.name)), equals(c('N', 'Prime')))
+#expect_that(nrow(get(variable.name)), equals(5))
+#expect_that(ncol(get(variable.name)), equals(2))
+#expect_that(get(variable.name)[5, 2], equals(11))
+#rm(example.27.Sheet1)
# Example 28: SQLite3 Support with .sql Extension with table = "..."
message('Example 28: Testing .sql with table = "x" support')

0 comments on commit 84f766f

Please sign in to comment.