-
Notifications
You must be signed in to change notification settings - Fork 1
Sync up development with main #478
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 89 commits
Commits
Show all changes
91 commits
Select commit
Hold shift + click to select a range
69b3632
Merge pull request #434 from AlexsLemonade/allyhawkins/merged-changelog
allyhawkins 6767d8c
see if i can turn on spell check
sjspielman 4276815
Update sce_file_contents
sjspielman ec86ac2
Update merged_contents, and reorder in sce_file_contents
sjspielman 8080cd5
add doublets processing
sjspielman 5eeaa62
Merge pull request #442 from AlexsLemonade/sjspielman/turn-on-manuscr…
sjspielman 50a6311
Merge branch 'the-manuscript' into sjspielman/436-437-doublets
sjspielman b2d0312
Update docs/sce_file_contents.md
sjspielman e4ecfeb
Merge pull request #443 from AlexsLemonade/sjspielman/436-437-doublets
sjspielman 0500e74
#438: update ADT filtering language
sjspielman 46d1266
#439: clarify normalization approach
sjspielman bacfbe6
Add faq section about mudata, and fix typo readh5ad -> read_h5ad whil…
sjspielman 57b56a4
also add into getting_started
sjspielman 7681dfb
MuData to dictionary
sjspielman 773e734
Merge pull request #444 from AlexsLemonade/sjspielman/438-439-doc-upd…
sjspielman f5b71f6
Merge branch 'the-manuscript' into sjspielman/440-mudata-getting-started
sjspielman 44755d9
Apply suggestions from code review
sjspielman e266a91
remove code and replace with link in faq
sjspielman 181b1fc
Revert "remove code and replace with link in faq"
sjspielman 45a05fa
general sentence directing to getting started
sjspielman f24d3e2
Merge pull request #445 from AlexsLemonade/sjspielman/440-mudata-gett…
sjspielman a44fcdc
explain that some fields are missing due to type conversion
sjspielman 52fe0f3
phrasing tweak and state plainly that singler_results is DF
sjspielman 9add3a2
data frames are ok
sjspielman 97002d4
add inferCNV file contents
sjspielman 1bd6e42
add processing information section
sjspielman 6ae462e
tweaks
sjspielman dde0636
get rid of those extra 2lines
sjspielman a5661ab
CNV to dictionary
sjspielman 02a6a46
Apply suggestions from code review
sjspielman 56ff051
text update to link back to cell types
sjspielman 89c87c3
Update docs/sce_file_contents.md
sjspielman 79a5996
Merge pull request #453 from AlexsLemonade/sjspielman/anndata-updated…
sjspielman d2e1188
Merge branch 'the-manuscript' into sjspielman/infercnv-docs
sjspielman 9505c08
Merge pull request #454 from AlexsLemonade/sjspielman/infercnv-docs
sjspielman 4d18d4e
processing openscpca annotations
allyhawkins b88a1ee
where to find openscpca annotations
allyhawkins 42c1c14
add openscpca to dictionary
allyhawkins 9282d6b
spell appropriate
allyhawkins e0d5918
Apply suggestions from code review
allyhawkins d6eb8b1
account for new split metadata entries
allyhawkins fa94eb7
add a note about where to find openscpca info
allyhawkins e312f81
Apply suggestions from code review
allyhawkins acca2f9
Merge pull request #455 from AlexsLemonade/allyhawkins/openscpca-anno…
allyhawkins 892686a
add infercnv faqs and fix a link
sjspielman e898f35
more links
sjspielman 029a68f
infercnv to dictionary
sjspielman 22ab3d7
missing a period
sjspielman 67814e7
Update docs/faq.md - end sentence where it should end
sjspielman fe5783c
Merge pull request #456 from AlexsLemonade/sjspielman/infercnv-faqs
sjspielman 885f9ad
include scimilarity in processing
allyhawkins a237df9
scimilarity to sce contents
allyhawkins 045492d
add Heimberg to dictionary
allyhawkins 00a632e
Apply suggestions from code review
allyhawkins 0f0ba35
add infercnv options to merged
allyhawkins feb468a
among not between
allyhawkins de2d299
link to openscpca and mention consensus at the beginning
allyhawkins 81d57eb
remove a period
allyhawkins 77b08bf
Merge pull request #457 from AlexsLemonade/allyhawkins/document-scimi…
allyhawkins 610453e
use foundation
allyhawkins 80626d8
Merge pull request #458 from AlexsLemonade/allyhawkins/foundation
allyhawkins 1e00476
Add section to download files
jashapiro 0c67f57
Add FAQ entry
jashapiro f4695c5
Fix a few links and filenames
jashapiro c15a8c9
update dictionary
jashapiro 7072d7a
Update docs/download_files.md
jashapiro 99a4729
Merge pull request #460 from AlexsLemonade/jashapiro/scpcar
jashapiro 88498bb
add new infercnv metadata fields
allyhawkins c9698a6
Apply suggestions from code review
allyhawkins 579607d
specify no infercnv on normal
allyhawkins 159129d
Merge pull request #463 from AlexsLemonade/allyhawkins/462-infercnv-b…
allyhawkins 486da83
rewording for consensus methods
allyhawkins cd17e80
Merge pull request #464 from AlexsLemonade/allyhawkins/reword-consens…
allyhawkins f6d4983
new feature changelog
allyhawkins c65a594
neuroblastoma to the dictionary
allyhawkins fac010d
Apply suggestions from code review
allyhawkins 1a442e8
Merge pull request #469 from AlexsLemonade/allyhawkins/new-features-c…
allyhawkins 9fa777d
just adding in today's date for the release
allyhawkins b2a2833
Merge pull request #471 from AlexsLemonade/allyhawkins/manuscript-rel…
allyhawkins 9878b93
filtered and processed
allyhawkins 7205cee
temporarily add back the-manuscript
allyhawkins e19c59a
Merge pull request #472 from AlexsLemonade/allyhawkins/tiny-pr
allyhawkins 9d98100
Merge pull request #470 from AlexsLemonade/the-manuscript
allyhawkins 81e70e3
add missing >
sjspielman 8e7747b
there was another one
sjspielman 447a713
oh boy, caught a few more in the rendered site
sjspielman 638d184
Merge pull request #476 from AlexsLemonade/sjspielman/473-fix-link
sjspielman 08728c0
Merge remote-tracking branch 'origin/main' into allyhawkins/sync-main…
allyhawkins 7f8b351
remove the manuscript
allyhawkins 47a2180
Apply suggestions from code review
allyhawkins 2f91e05
one more space
allyhawkins File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,9 +16,9 @@ Note that multiplexed sample libraries are only available as `SingleCellExperime | |
| See the {ref}`FAQ section about samples and libraries <faq:What is the difference between samples and libraries?>` for more information. | ||
|
|
||
| The files shown below will be included with each library (example shown for a library with ID `SCPCL000000`): | ||
| - An unfiltered counts file: `SCPCL000000_unfiltered.rds` or `SCPCL00000_unfiltered_rna.h5ad`, | ||
| - A filtered counts file: `SCPCL000000_filtered.rds` or `SCPCL00000_filtered_rna.h5ad`, | ||
| - A processed counts file: `SCPCL000000_processed.rds` or `SCPCL00000_processed_rna.h5ad`, | ||
| - An unfiltered counts file: `SCPCL000000_unfiltered.rds` or `SCPCL000000_unfiltered_rna.h5ad`, | ||
| - A filtered counts file: `SCPCL000000_filtered.rds` or `SCPCL000000_filtered_rna.h5ad`, | ||
| - A processed counts file: `SCPCL000000_processed.rds` or `SCPCL000000_processed_rna.h5ad`, | ||
| - A quality control report: `SCPCL000000_qc.html`, | ||
| - A supplemental cell type report: `SCPCL000000_celltype-report.html` | ||
|
|
||
|
|
@@ -188,7 +188,7 @@ This file contains the raw and normalized counts data for cell barcodes that hav | |
| In addition to the counts matrices, the `SingleCellExperiment` or `AnnData` object stored in the file includes the results of dimensionality reduction using both principal component analysis (PCA) and UMAP. | ||
|
|
||
| See {ref}`Single-cell gene expression file contents <sce_file_contents:Single-cell gene expression file contents>` for more information about the contents of the `SingleCellExperiment` and `AnnData` objects and the included statistics and metadata. | ||
| See also {ref}`Using the provided RDS files in R <faq:how do i use the provided RDS files in r?>` and {ref}`Using the provided H5AD files in Python <faq:how do i use the provided H5AD files in python?>`. | ||
| See also {ref}`Getting started with an ScPCA dataset <getting_started:Getting started with an scpca dataset>`. | ||
|
|
||
| ## QC report | ||
|
|
||
|
|
@@ -325,3 +325,40 @@ The `SCPCP000000_bulk_quant.tsv` file contains a gene by sample matrix (each row | |
| The `SCPCP000000_bulk_metadata.tsv` file contains associated metadata for all samples with bulk RNA-seq data. | ||
| This file will contain fields equivalent to those found in the `single-cell_metadata.tsv` related to processing the sample, but will not contain patient or disease specific metadata (e.g. `age`, `sex`, `diagnosis`, `subdiagnosis`, `tissue_location`, or `disease_timing`). | ||
| See also {ref}`processing bulk RNA samples <processing_information:Bulk RNA samples>`. | ||
|
|
||
| ## Programmatic downloads from the ScPCA Portal | ||
|
|
||
| We provide an R package, [`ScPCAr`](https://alexslemonade.github.io/ScPCAr/), to facilitate programmatic access to the ScPCA Portal. | ||
| This package allows you to search for and download data from the ScPCA Portal directly within R. | ||
|
|
||
| An example of basic usage of the `ScPCAr` package follows: | ||
|
|
||
| ```r | ||
| library(ScPCAr) | ||
|
|
||
| # First, look at the terms of use | ||
| view_terms() | ||
|
|
||
| # Get an authentication token for use with the ScPCA Portal | ||
| auth_token <- get_auth(email = "[email protected]", agree = TRUE) | ||
|
|
||
| # Get the sample metadata for a project | ||
| sample_metadata <- get_sample_metadata(project_id = "SCPCP000001") | ||
|
|
||
| # Download data for a sample | ||
| # this function returns a vector of the downloaded file paths | ||
| file_paths <- download_sample( | ||
| sample_id = "SCPCS000001", | ||
| auth_token = auth_token, | ||
| destination = "scpca_data", | ||
| format = "sce" | ||
| ) | ||
|
|
||
| # select and read in the processed SingleCellExperiment object | ||
| processed_data <- grep("_processed.rds$", file_paths) | ||
| sce <- readRDS(processed_data) | ||
| ``` | ||
|
|
||
| Please see the [package documentation](https://alexslemonade.github.io/ScPCAr/) for more details about installation and usage. | ||
| Source code for the package can be found on [GitHub](https://github.com/AlexsLemonade/ScPCAr). | ||
| Information about working with downloaded files can be found in our {ref}`Getting started with an ScPCA dataset <getting_started:Getting started with an scpca dataset>` guide. | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.