Merge remote-tracking branch 'upstream/master'

# Conflicts:
# DESCRIPTION

Shana White authored on 26/03/2019 17:54:19
Showing 2 changed files

... ...
@@ -1,7 +1,6 @@
1 1
 Package: KEGGlincs
2 2
 Type: Package
3 3
 Title: Visualize all edges within a KEGG pathway and overlay LINCS data
4
-        [option]
5 4
 Version: 1.9.1
6 5
 Date: 2016-06-02
7 6
 Author: Shana White
... ...
@@ -14,7 +13,7 @@ LazyData: true
14 13
 RoxygenNote: 6.1.1
15 14
 Depends: R (>= 3.3), KOdata, hgu133a.db, org.Hs.eg.db (>= 3.3.0)
16 15
 SystemRequirements: Cytoscape (>= 3.3.0), Java (>= 8)
17
-Suggests: BiocInstaller (>= 1.20.3), knitr, graph
16
+Suggests: BiocManager (>= 1.20.3), knitr, graph
18 17
 biocViews: NetworkInference, GeneExpression, DataRepresentation,
19 18
         ThirdPartyClient,CellBiology,GraphAndNetwork,Pathways,KEGG,Network
20 19
 Imports:
... ...
@@ -10,11 +10,12 @@ Installation:
10 10
 
11 11
 ```{r}
12 12
 #Make sure that the following bioconductor packages are installed
13
-source("http://bioconductor.org/biocLite.R")
14
-biocLite(c("hgu133a.db", "KEGGgraph", "KEGGREST", "KOdata"))
13
+if (!requireNamespace("BiocManager", quietly=TRUE))
14
+    install.packages("BiocManager")
15
+BiocManager::install(c("hgu133a.db", "KEGGgraph", "KEGGREST", "KOdata"))
15 16
 
16 17
 #Download package
17
-biocLite("KEGGlincs")
18
+BiocManager::install("KEGGlincs")
18 19
 
19 20
 #Load/activate package for use
20 21
 library(KEGGlincs)