diff --git a/Dockerfile b/Dockerfile index 17c2651..6c1d394 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,8 +59,8 @@ RUN R -e 'remotes::install_github("AllenInstitute/scrattch.bigcat")' RUN R -e 'remotes::install_github("AllenInstitute/mfishtools")' ## scrattch-mapping install from local source -COPY scrattch.mapping_0.17.tar.gz ./scrattch.mapping_0.17.tar.gz -RUN R -e 'install.packages("scrattch.mapping_0.17.tar.gz", repos=NULL, type="source")' +COPY scrattch.mapping_0.2.tar.gz ./scrattch.mapping_0.2.tar.gz +RUN R -e 'install.packages("scrattch.mapping_0.2.tar.gz", repos=NULL, type="source")' ## Clean up RUN rm -rf /var/lib/apt/lists/* @@ -68,4 +68,6 @@ RUN rm -rf /tmp/downloaded_packages ## Strip binary installed libraries from RSPM ## https://github.com/rocker-org/rocker-versioned2/issues/340 -RUN strip /usr/local/lib/R/site-library/*/libs/*.so \ No newline at end of file +RUN strip /usr/local/lib/R/site-library/*/libs/*.so + +## \ No newline at end of file diff --git a/R/buildPatchseqTaxonomy.R b/R/buildPatchseqTaxonomy.R index 9a57f26..93297ae 100644 --- a/R/buildPatchseqTaxonomy.R +++ b/R/buildPatchseqTaxonomy.R @@ -92,9 +92,6 @@ buildPatchseqTaxonomy = function(AIT.anndata, AIT.anndata$uns$QC_markers[[mode.name]] = file.path(taxonomyModeDir, "QC_markers.RData") ## TO BE UPDATED -- JEREMY - ## Save patch-seq taxonomy anndata - AIT.anndata$write_h5ad(file.path(taxonomyDir, "AI_taxonomy.h5ad")) - ################## ## ------- Modify the dendrogram and save ## @@ -113,6 +110,9 @@ buildPatchseqTaxonomy = function(AIT.anndata, ## Store the prunned dendrogram, in dend list under "patchseq" mode.name AIT.anndata$uns$dend[[mode.name]] = file.path(taxonomyModeDir,"dend.RData") + ## Save patch-seq taxonomy anndata + AIT.anndata$write_h5ad(file.path(taxonomyDir, "AI_taxonomy.h5ad")) + ## Update markers after pruning dend = addDendrogramMarkers(AIT.anndata, mode=mode.name) diff --git a/examples/build_taxonomy.md b/examples/build_taxonomy.md index 4e72dc6..c53f056 100644 --- a/examples/build_taxonomy.md +++ b/examples/build_taxonomy.md @@ -55,5 +55,4 @@ AIT.anndata = loadTaxonomy("/allen/programs/celltypes/workgroups/rnaseqanalysis/ ## Add markers to dendrogram addDendrogramMarkers(AIT.anndata = AIT.anndata) - ```