Skip to content
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

Fix lookups #173

Merged
merged 7 commits into from
Sep 29, 2021
Merged

Fix lookups #173

merged 7 commits into from
Sep 29, 2021

Conversation

alexvpickering
Copy link
Contributor

@alexvpickering alexvpickering commented Sep 28, 2021

Background

The lookups were broken because @misc slot get's overwritten by merging of scdata_list

Link to staging deployment URL

https://ui-olivergibson-p173.scp-staging.biomage.net/data-management

Links to any Pull Requests related to this

Anything else the reviewers should know about the changes here

Changes

Code changes

Definition of DONE

Your changes will be ready for merging after each of the steps below have been completed:

Testing

  • Unit tests written
  • Tested locally with Inframock (with latest production data downloaded with biomage experiment pull)
  • Deployed to staging
  • Passed integration tests

To set up easy local testing with inframock, follow the instructions here: https://github.com/biomage-ltd/inframock
To deploy to the staging environment, follow the instructions here: https://github.com/biomage-ltd/biomage-utils

Documentation updates

Is all relevant documentation updated to reflect the proposed changes in this PR?

  • Relevant Github READMEs updated
  • Relevant wiki pages created/updated

Approvers

  • Approved by a member of the core engineering team
  • (UX changes) Approved by vickymorrison (this is her username, tag her if you need approval)

Just before merging:

Optional

  • Photo of a cute animal attached to this PR

# corresponding names stored in seurat object meta.data
seurat_keys <- scdata@misc$metadata_lookups[keys]
# same values used in construct_metadata
seurat_keys <- make.names(c('samples', keys), unique = TRUE)[-1]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't quite get why samples is here, because we already generate the samples cell_sets, right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On line 74 - 81

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's just so that make.names has the same supplied values as it did in create_seurat

@codecov
Copy link

codecov bot commented Sep 28, 2021

Codecov Report

Merging #173 (bbf32f8) into master (299322d) will increase coverage by 1.96%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #173      +/-   ##
==========================================
+ Coverage   54.72%   56.69%   +1.96%     
==========================================
  Files          19       19              
  Lines        1239     1233       -6     
==========================================
+ Hits          678      699      +21     
+ Misses        561      534      -27     
Impacted Files Coverage Δ
pipeline-runner/R/gem2s-5-create_seurat.R 100.00% <100.00%> (ø)
pipeline-runner/R/gem2s-7-upload_to_aws.R 59.81% <100.00%> (ø)
pipeline-runner/R/qc-6-integrate_scdata.R 19.70% <0.00%> (+19.70%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 299322d...bbf32f8. Read the comment docs.

@ogibson ogibson merged commit cb8c49b into master Sep 29, 2021
@ogibson ogibson deleted the fix-lookups branch September 29, 2021 00:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants