Merge pull request #23 from turgeonmaxime/master

Update .travis.yml and .Rbuildignore
GreenwoodLab · Dec 19, 2016 · 43eaf1f · 43eaf1f
2 parents a803e19 + 7268e66
commit 43eaf1f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -6,3 +6,6 @@
 .\.RData$
 \.(PCR|PLS)\.pdf$
 ^funtooNorm_old\.Rnw$
+^\.travis\.yml$
+^\.gitignore$
+^.git
diff --git a/.gitignore b/.gitignore
@@ -3,9 +3,9 @@
 *.RData
 funtooNorm.Rproj
 .Rbuildignore
+inst/doc
 # files created during vignette building
 vignettes/*
 !vignettes/funtooNorm.Rnw
 !vignettes/funtooNorm.pdf
 
-
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,7 @@
 language: r
+r:
+  - release
+  - devel
 sudo: required
 
 env:

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -4,7 +4,7 @@ Title: Normalization Procedure for Infinium HumanMethylation450 BeadChip Kit
 Version: 0.99.7
 Date: 2016-12-14
 Author: Celia Greenwood <[email protected]>,Stepan Grinek
-    <[email protected]>, Kathleen Klein <[email protected]> 
+    <[email protected]>, Kathleen Klein <[email protected]>
 Maintainer: Kathleen Klein <[email protected]>
 Description: Provides a function to normalize Illumina Infinium Human
     Methylation 450 BeadChip (Illumina 450K), correcting for tissue and/or cell
@@ -31,4 +31,4 @@ Depends:
 LazyData: true
 VignetteBuilder: knitr
 biocViews: DNAMethylation, Preprocessing, Normalization
-RoxygenNote: 5.0.1.9000
+RoxygenNote: 5.0.1
diff --git a/man/funtooNorm.Rd b/man/funtooNorm.Rd