Browse code

Commit made by the Bioconductor Git-SVN bridge. Consists of 4 commits.

Commit information:

Commit id: daf73869a28fb6f1282922b930a25b7d864e09f6

Merge branch 'develop'

Committed by: hb
Author Name: hb
Commit date: 2015-01-18 12:39:31 -0800
Author date: 2015-01-18 12:39:31 -0800

Commit id: f37998808868d30d187474dfc559b4fa835a3db0

Updated NEWS

Committed by: hb
Author Name: hb
Commit date: 2015-01-18 12:39:10 -0800
Author date: 2015-01-18 12:39:10 -0800

Commit id: da10c0d75a45c352cf99616231fdcb1468081bc4

ROBUSTNESS: Added 'SystemRequirements: GNU make' for now.

Committed by: hb
Author Name: hb
Commit date: 2015-01-18 12:27:33 -0800
Author date: 2015-01-18 12:27:33 -0800

Commit id: 6c5ad911d41c140794065e43c1b109fa692b6fa2

CLEANUP: Now using requireNamespace() instead of require().

Committed by: hb
Author Name: hb
Commit date: 2015-01-18 12:23:04 -0800
Author date: 2015-01-18 12:23:04 -0800


git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/affxparser@98445 bc3139a8-67e5-0310-9ffc-ced21a209358

Kasper D. Hansen authored on 18/01/2015 20:40:19
Showing 4 changed files

... ...
@@ -2,6 +2,7 @@ Package: affxparser
2 2
 Version: 1.39.4
3 3
 Depends: R (>= 2.6.0)
4 4
 Suggests: R.oo (>= 1.18.0), R.utils (>= 1.34.0), AffymetrixDataTestFiles
5
+SystemRequirements: GNU make
5 6
 Date: 2015-01-18
6 7
 Title: Affymetrix File Parsing SDK
7 8
 Authors@R: c(
... ...
@@ -2,6 +2,7 @@ Package: affxparser
2 2
 ===================
3 3
 
4 4
 Version: 1.39.4 [2015-01-18]
5
+o ROBUSTNESS: 'GNU make' is a SystemRequirements (for now).
5 6
 o ROBUSTNESS: Did not seem to be needed, but package is now a good citizen
6 7
   and do library.dynlib.unload() when unloaded.
7 8
 o CLEANUP: Now using requireNamespace() instead of require().
... ...
@@ -87,7 +87,10 @@ readCdfUnitsWriteMap <- function(filename, units=NULL, ..., verbose=FALSE) {
87 87
 
88 88
   # Argument 'verbose':
89 89
   if (!identical(verbose, FALSE)) {
90
-    require(R.utils) || stop("Package not available: R.utils");
90
+    requireNamespace("R.utils") || stop("Package not loaded: R.utils");
91
+    Arguments <- R.utils::Arguments
92
+    enter <- R.utils::enter
93
+    exit <- R.utils::exit
91 94
     verbose <- Arguments$getVerbose(verbose);
92 95
   }
93 96
 
... ...
@@ -197,7 +197,10 @@ readCelUnits <- function(filenames, units=NULL, stratifyBy=c("nothing", "pmmm",
197 197
 
198 198
   # Argument 'verbose': (Utilized the Verbose class in R.utils if available)
199 199
   if (!identical(verbose, FALSE)) {
200
-    require(R.utils) || stop("Package not available: R.utils");
200
+    requireNamespace("R.utils") || stop("Package not loaded: R.utils");
201
+    Arguments <- R.utils::Arguments
202
+    enter <- R.utils::enter
203
+    exit <- R.utils::exit
201 204
     verbose <- Arguments$getVerbose(verbose);
202 205
   }
203 206
   cVerbose <- -(as.numeric(verbose) + 2);