diff --git a/DESCRIPTION b/DESCRIPTION index 3713e3af4..6562d2fa8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: bcbioSingleCell Title: bcbio Single-Cell RNA-Seq Description: R package for bcbio single-cell RNA-seq analysis. -Version: 0.4.3 -Date: 2018-08-27 +Version: 0.4.4 +Date: 2018-09-09 Authors@R: c( person( given = "Michael", @@ -54,12 +54,12 @@ LazyData: false Depends: R (>= 3.6), SingleCellExperiment (>= 1.6), - basejump (>= 0.11.11) + basejump (>= 0.11.14) Imports: acidplots (>= 0.2.14), bcbioBase (>= 0.6.10), - bioverbs (>= 0.2.7), - goalie (>= 0.3.6), + bioverbs (>= 0.2.9), + goalie (>= 0.3.7), BiocGenerics (>= 0.30), BiocParallel (>= 1.18), IRanges (>= 2.18.2), @@ -73,7 +73,7 @@ Imports: methods, utils Suggests: - acidroxygen (>= 0.1), + acidroxygen (>= 0.1.2), BiocStyle (>= 2.12), R.utils (>= 2.9), knitr (>= 1.24), diff --git a/NEWS.md b/NEWS.md index 00293254d..a438776a6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,12 @@ +## bcbioSingleCell 0.4.4 (2019-09-09) + +### Minor changes + +- `bcbioSingleCell`: Internal generator now calls `importSampleData` using + `pipeline = "bcbio"` argument, so we don't run into breaking changes when + handling user metadata in a future basejump update. +- Updated basejump dependency versions. + ## bcbioSingleCell 0.4.3 (2019-08-27) ### Minor changes diff --git a/R/AllGenerators.R b/R/AllGenerators.R index bd8e4fe1b..56fd31cc9 100644 --- a/R/AllGenerators.R +++ b/R/AllGenerators.R @@ -137,7 +137,11 @@ bcbioSingleCell <- function( allSamples <- TRUE sampleData <- NULL if (isString(sampleMetadataFile)) { - sampleData <- importSampleData(sampleMetadataFile, lanes = lanes) + sampleData <- importSampleData( + file = sampleMetadataFile, + lanes = lanes, + pipeline = "bcbio" + ) ## Error on incorrect reverse complement input. if ("sequence" %in% colnames(sampleData)) { sampleDirSequence <- str_extract(names(sampleDirs), "[ACGT]+$") diff --git a/docs/404.html b/docs/404.html index d50c9f10a..ffb45c593 100644 --- a/docs/404.html +++ b/docs/404.html @@ -8,11 +8,13 @@
libgsl-dev
installation for zinbwave on Travis CI.diffExp
.updateObject
method support for bcbioSingleCell
class.validObject
validity check to not require sample-level metadata in colData
yet.seurat
objects in coercion method. This helps maintain the gene symbol appearance in plotting functions for genes with hyphens in the names.BiocParallel::SerialParam
internally for zinbwave in diffExp
.cell2sample
internal code to always use mapCellsToSamples
instead of attempting to use a stashed vector
inside metadata
for SingleCellExperiment
method.plotCellTypesPerCluster
is using dark = TRUE
by default again.aggregateReplicates
function has been reworked to return a SingleCellExperiment
object instead of bcbioSingleCell
. The v0.2.4 update of bcbioRNASeq behaves similarly with this generic.
seurat
SingleCellExperiment
method support, using as(x, "SingleCellExperiment")
internally, which uses the new Seurat::Convert
function.plotClusters
, plotTSNEExpressionData
, loadSingleCellRun
, darkTheme
, pcCutoff
, quantileHeatmap
, plotKnownMarkers
, readMarkers
, readMarkersFile
.stripTranscriptVersions
command applied, to remove the Ensembl transcript versions if present.readCellRanger
no longer requires reference data defined by refdataDir
, although this is still recommended.
cellranger_small
and seurat_small
datasets to the publicly available pbmc4k dataset from 10X Genomics. Here we’ve subset the top 500 cells and genes by abundance. We’ll use either the pbmc4k or pbmc8k dataset for the vignette in a future update.text
as primary argument in markdownHeader
calls.as(object, "SingleCellExperiment")
coercion now slots stashed metadata into SingleCellExperiment
, if defined.cell_cycle_markers
is used in place of cellCycleMarkers
, and cell_type_markers
in place of cellTypeMarkers
. There’s no easy way to link these files as aliases, so this is a necessary breaking change.mapCellsToSamples
. This is now only called internally.filterCells
function is still provided here.prepareSingleCellTemplate
: Improved internal code to use updated prepareTemplate
, which has been migrated to basejump package.AllClasses.R
file.cellranger_small
to cellranger
, and indrops_small
to simply indrops
.barcodePattern
global variable.metrics
: Removed code and consolidated SingleCellExperiment
method support in basejump package.
bcbioSingleCell
generator: improved internal handling of mapCellsToSamples
call. This reworked join step checks the sampleID mapping more carefully.[
on bcbioSingleCell
class objects no longer alters the version of the object. It only sets subset = TRUE
, similar to bcbioRNASeq.emptyRanges
from mcolsNames
to mcolnames
. This has been changed in basejump 0.10.3.bcbioSingleCell
from SingleCellExperiment
where applicable. Generally, this applies to the supported QC plotting functions. Previously, the methods were defined against SingleCellExperiment
to also support CellRanger
S4 class, which has since been moved to the Chromium package.reexports.Rd
file no longer necessary.prepareSingleCellTemplate
, in favor of prepareTemplate
.singlecell
Docker image.barcodeRanksPerSample
and plotBarcodeRanks
to support DropletUtils update in Bioconductor 3.9.updateObject
: Simplified method support, dropping rowRanges
argument. No longer attempting to coerce assays back to a simple list, which doesn’t work well on Bioconductor 3.10 Devel currently.
plotReadsPerCell
: Reworked internal code to use DataFrame
primarily instead of tbl_df
, so we can remove dplyr dependency.bcbioSingleCell
: Simplifed internal colData
handling, calling calculateMetrics
after creating SingleCellExperiment
with makeSingleCellExperiment
. This improves consistency with Chromium package and enables better preparation of rowRanges
containing spike-ins and transgenes.
Harvard inDrops v3 example data
-bcb
-
+
+
An object of class bcbioSingleCell
with 50 rows and 100 columns.
Updated 2019-08-12.
-data(bcb) @@ -156,11 +155,8 @@@@ -90,7 +93,6 @@ Changelog -Examp diff --git a/docs/reference/bcbioSingleCell-class.html b/docs/reference/bcbioSingleCell-class.html index f7af03227..8eaa5861d 100644 --- a/docs/reference/bcbioSingleCell-class.html +++ b/docs/reference/bcbioSingleCell-class.html @@ -8,11 +8,13 @@
bcbio single-cell RNA-seq data set — bcbioSingleCell-class • bcbioSingleCell + + @@ -34,8 +36,8 @@ - + @@ -71,7 +74,7 @@
bcbioSingleCell
is an S4 class that extends SingleCellExperiment
, and is
designed to store a bcbio single-cell RNA-seq analysis. This class contains
read counts saved as a sparse matrix (sparseMatrix
), sample metadata, and
cell quality control metrics.
Updated 2019-08-21.
-Import and analyze bcbio single-cell RNA-seq data.
-bcbioSingleCell
is an S4 class that extends SingleCellExperiment
, and is
designed to store a bcbio single-cell RNA-seq analysis. This class contains
read counts saved as a sparse matrix (sparseMatrix
), sample metadata, and
cell quality control metrics.
bcbioSingleCell(uploadDir, sampleMetadataFile = NULL, organism = NULL, @@ -130,7 +130,7 @@- +bcbio single-cell RNA-seq data set
transgeneNames = NULL, spikeNames = NULL, interestingGroups = "sampleName", BPPARAM = BiocParallel::SerialParam(), ...)
Additional arguments. |
bcbioSingleCell
.
Updated 2019-08-27.
-uploadDir <- system.file("extdata/indrops", package = "bcbioSingleCell") x <- bcbioSingleCell(uploadDir)#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>-#>print(x)#> bcbioSingleCell 0.4.3 -#> uploadDir: /Users/mike/R/x86_64-apple-darwin15.6.0-library/3.6/bcbioSingleCell/extdata/indrops -#> dates(2): [bcbio] 2018-01-01; [R] 2019-08-27 +#>print(x)#> bcbioSingleCell 0.4.4 +#> uploadDir: /tmp/RtmpzwtPV8/temp_libpath9c5a3896d068/bcbioSingleCell/extdata/indrops +#> dates(2): [bcbio] 2018-01-01; [R] 2019-09-09 #> level: genes #> interestingGroups: sampleName #> filtered: FALSE @@ -258,11 +254,11 @@Examp sampleMetadataFile = file.path(uploadDir, "metadata.csv") )
#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>#>-#>print(x)#> bcbioSingleCell 0.4.3 -#> uploadDir: /Users/mike/R/x86_64-apple-darwin15.6.0-library/3.6/bcbioSingleCell/extdata/indrops -#> dates(2): [bcbio] 2018-01-01; [R] 2019-08-27 +#>print(x)#> bcbioSingleCell 0.4.4 +#> uploadDir: /tmp/RtmpzwtPV8/temp_libpath9c5a3896d068/bcbioSingleCell/extdata/indrops +#> dates(2): [bcbio] 2018-01-01; [R] 2019-09-09 #> level: genes -#> sampleMetadataFile: /Users/mike/R/x86_64-apple-darwin15.6.0-library/3.6/bcbioSingleCell/extdata/indrops/metadata.csv +#> sampleMetadataFile: /tmp/RtmpzwtPV8/temp_libpath9c5a3896d068/bcbioSingleCell/extdata/indrops/metadata.csv #> interestingGroups: sampleName #> filtered: FALSE #> class: SingleCellExperiment @@ -282,15 +278,10 @@diff --git a/docs/reference/bcbioSingleCellTestsURL.html b/docs/reference/bcbioSingleCellTestsURL.html index 47e66e18f..472af7735 100644 --- a/docs/reference/bcbioSingleCellTestsURL.html +++ b/docs/reference/bcbioSingleCellTestsURL.html @@ -8,11 +8,13 @@Examp
Contents
@@ -306,7 +297,7 @@Author
Cache URL — bcbioSingleCellTestsURL • bcbioSingleCell + + @@ -34,13 +36,14 @@ - + + @@ -68,7 +71,7 @@
Cache URL
-bcbioSingleCellTestsURL
-
+
+
An object of class character
of length 1.
@@ -132,9 +132,7 @@bcbioSingleCellTestsURL#> [1] "http://tests.acidgenomics.com/bcbioSingleCell/v0.4"
Defunct functions
-readCellRanger(...) prepareSingleCellTemplate(...)- +
Additional arguments. |
.Defunct
.
diff --git a/docs/reference/deprecated.html b/docs/reference/deprecated.html index 81d92da09..8d9ba37ce 100644 --- a/docs/reference/deprecated.html +++ b/docs/reference/deprecated.html @@ -8,11 +8,13 @@Deprecated functions — deprecated • bcbioSingleCell + + @@ -34,13 +36,14 @@ - + + @@ -68,7 +71,7 @@
Deprecated functions
-plotGenesPerCell(...) @@ -124,7 +124,7 @@- +Deprecated functions
plotUMIsPerCell(...) plotUMIsVsGenes(...)
Additional arguments. |
.Deprecated
.
diff --git a/docs/reference/extract.html b/docs/reference/extract.html index 6b11a3916..028e0bcd7 100644 --- a/docs/reference/extract.html +++ b/docs/reference/extract.html @@ -8,11 +8,13 @@Extract or replace parts of an object — extract • bcbioSingleCell + + @@ -34,13 +36,14 @@ - + + @@ -68,7 +71,7 @@
Extract genes by row and cells by column.
-# S4 method for bcbioSingleCell,ANY,ANY,ANY [(x, i, j, ..., drop = FALSE)- +
bcbioSingleCell
.
Refer to cell2sample()
and
@@ -195,17 +194,14 @@
Unfiltered cellular barcode distributions for the entire dataset, including
cells not kept in the matrix will be dropped in favor of the nCount
column
of colData()
.
Updated 2019-08-20.
-Becker, R. A., Chambers, J. M. and Wilks, A. R. (1988) The New S Language. Wadsworth & Brooks/Cole.
-diff --git a/docs/reference/index.html b/docs/reference/index.html index c264f85f1..9a1eade68 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -8,11 +8,13 @@Function reference • bcbioSingleCell + + @@ -34,10 +36,12 @@ + + @@ -65,7 +69,7 @@
Plot the distribution of read counts for all unfiltered cellular barcodes.
-plotReadsPerCell(object, ...) @@ -129,7 +129,7 @@- +Plot read counts per cell
acidplots::scale_colour_synesthesia_d()), fill = getOption(x = "acid.fill.discrete", default = acidplots::scale_fill_synesthesia_d()), title = "Reads per cell")
Additional arguments. |
ggplot
.
Updated 2019-08-12.
-diff --git a/docs/reference/reexports.html b/docs/reference/reexports.html index 6f123ded5..ab5616f2d 100644 --- a/docs/reference/reexports.html +++ b/docs/reference/reexports.html @@ -8,11 +8,13 @@Objects exported from other packages — reexports • bcbioSingleCell + + @@ -34,19 +36,21 @@ - + + @@ -74,7 +78,7 @@
These objects are imported from other packages. Follow the links below to see their documentation.
-Display the object, by printing, plotting or whatever suits its
class. This function exists to be specialized by methods. The
default method calls showDefault
.
Formal methods for show
will
usually be invoked for automatic printing (see the details).
# S4 method for bcbioSingleCell show(object)- +
Any R object |
show
returns an invisible NULL
.
Objects from an S4 class (a class defined by a call to @@ -156,16 +155,13 @@
simpleInheritanceOnly
argument to setGeneric
and
the discussion in setIs
for the general concept.
-
Updated 2019-08-08.
-showMethods
prints all the methods for one or more
functions.
diff --git a/docs/reference/updateObject.html b/docs/reference/updateObject.html index 712afe7e2..d0a33e58b 100644 --- a/docs/reference/updateObject.html +++ b/docs/reference/updateObject.html @@ -8,11 +8,13 @@Update an object to its current class definition — updateObject • bcbioSingleCell + + @@ -34,14 +36,15 @@ - + + @@ -69,7 +72,7 @@
updateObject
is a generic function that returns an instance
of object
updated to its current class definition.
# S4 method for bcbioSingleCell updateObject(object)- +
updateObject
returns a valid instance of object
.
objclass
.
getObjectSlots
returns a list of named elements, with each
element corresponding to a slot in object
.
Updating objects is primarily useful when an object has been @@ -154,7 +153,7 @@
object
, and that the
object is valid (see validObject
). By default,
updateObject
has the following behaviors:updateObject(ANY, …, verbose=FALSE)
By default, updateObject
uses heuristic methods to determine
+
updateObject(ANY, ..., verbose=FALSE)
By default, updateObject
uses heuristic methods to determine
whether the object should be the `new' S4 type (introduced in R 2.4.0),
but is not. If the heuristics indicate an update is required,
the updateObjectFromSlots
function tries to update the
@@ -163,35 +162,34 @@
verbose
causes a message to be
printed describing the action.
- Arguments …
are passed to updateObjectFromSlots
.updateObject(list, …, verbose=FALSE)
Visit each element in list
, applying
- updateObject(list[[elt]], …, verbose=verbose)
.
updateObject(environment, …, verbose=FALSE)
Visit each element in environment
, applying
- updateObject(environment[[elt]], …, verbose=verbose)
updateObject(formula, …, verbose=FALSE)
Do nothing; the environment of the formula may be too general
+ Arguments ...
are passed to updateObjectFromSlots
.
updateObject(list, ..., verbose=FALSE)
Visit each element in list
, applying
+ updateObject(list[[elt]], ..., verbose=verbose)
.
updateObject(environment, ..., verbose=FALSE)
Visit each element in environment
, applying
+ updateObject(environment[[elt]], ..., verbose=verbose)
updateObject(formula, ..., verbose=FALSE)
Do nothing; the environment of the formula may be too general
(e.g., R_GlobalEnv
) to attempt an update.
updateObject(envRefClass, …, verbose=FALSE)
Attempt to update objects from fields using a strategy like +
updateObject(envRefClass, ..., verbose=FALSE)
Attempt to update objects from fields using a strategy like
updateObjectFromSlots
Method 1.
Updated 2019-08-12.updateObjectFromSlots(object, objclass=class(object), …,
+
updateObjectFromSlots(object, objclass=class(object), ...,
verbose=FALSE)
is a utility function that identifies the intersection
of slots defined in the object
instance and objclass
definition. Under Method 1, the corresponding elements in
- object
are then updated (with updateObject(elt, …,
+
, with object
are then updated (with updateObject(elt, ...,
verbose=verbose)
) and used as arguments to a call to new(class,
- …)
, with …
replaced by slots from the original
+ ...)...
replaced by slots from the original
object. If this fails, then Method 2 tries new(class)
and
assigns slots of object
to the newly created instance.getObjectSlots(object)
extracts the slot names and contents from
object
. This is useful when object
was created by a class
definition that is no longer current, and hence the contents of
object
cannot be determined by accessing known slots.Note
See also
-
Examples