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

Incorporate matrix tube sample accession into amplicon notebook v2 #200

Merged
merged 8 commits into from May 1, 2024

Conversation

charles-cowart
Copy link
Collaborator

@charles-cowart charles-cowart commented Apr 27, 2024

From @cbrenchy: To incorporate matrix tube sample accession, randomization and control naming schemes into the amplicon notebook. Specific updates: Update Test Data, change append function to pd.concat in optional part of amplicon notebook, add additional columns to prep file and update control names.

From @RodolfoSalido: Addresses #169

From @charles-cowart: Merges all changes w/latest codebase. All affected tests were reviewed and updated. All tests pass. Some additional error-handling added.

@charles-cowart charles-cowart changed the title WIP: manual-merged all updates Incorporate matrix tube sample accession into amplicon notebook v2 Apr 27, 2024
@charles-cowart
Copy link
Collaborator Author

Ostensibly ready for review. It is still a big one! However, some of the changes are just new files and changes that can be reviewed quickly.

Two version 2 scripts were added, since I couldn't audit their behavior on my own. @cbrenchy and I will review those once the merge has occurred.

Copy link
Contributor

@antgonza antgonza left a comment

Choose a reason for hiding this comment

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

A few comments/questions.

metapool/metapool.py Outdated Show resolved Hide resolved
metapool/metapool.py Outdated Show resolved Hide resolved
metapool/metapool.py Show resolved Hide resolved
metapool/metapool.py Outdated Show resolved Hide resolved
metapool/metapool.py Outdated Show resolved Hide resolved
metapool/metapool.py Outdated Show resolved Hide resolved
metapool/metapool.py Outdated Show resolved Hide resolved
metapool/metapool.py Outdated Show resolved Hide resolved
metapool/metapool.py Outdated Show resolved Hide resolved
metapool/metapool.py Outdated Show resolved Hide resolved
@@ -2,8 +2,10 @@
"zymo_dna_rna_shield":
"storage_liquid_lot_number":
"219839":
"mass_storage_tube_and_storage_liquid_before_sample_g": 16.9
Copy link
Collaborator

Choose a reason for hiding this comment

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

storage tube masses should not be found in this .yml file anymore

Copy link
Contributor

Choose a reason for hiding this comment

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

... just to confirm, where are they coming from? Any other columns not needed any longer?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Going forward, the Mayo is going to weigh every tube individually and provide that value in a "mass_storage_tube_and_storage_liquid_before_sample_g" column in the metadata they send us (instead of us adding that column and filling it in based on the lot average).

Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you. Just to confirm, should we assume that this will be part of the sample or the prep-info file? and what should be the role of the SPP here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thank you for the catch @mmbryant23 ! @antgonza they were most likely recently removed and I merged them back in by accident from Caitriona's branch. Things recently removed from the master can look like new lines of code/text in the feature branch. I'll remove them.

@mmbryant23
Copy link
Collaborator

mmbryant23 commented Apr 30, 2024 via email

@charles-cowart
Copy link
Collaborator Author

A quick update: The PR is passing all of its tests and lints correctly w/flake8. It looks like there's an issue with code-coverage calculation and coveralls. That doesn't appear to be related to the codebase, since none of that has recently changed. I'll give it some time and rerun the coverage generation later.

@charles-cowart
Copy link
Collaborator Author

@antgonza ready for review! The appearance of the error in coverage didn't appear to be caused by a version change; I confirmed the versions did not change from the last successful version until now. There does appear to be an issue for some people who experience this error, possibly because a .pyc file was introduced at one point into the repository:

https://stackoverflow.com/questions/2386975/no-source-for-code-message-in-coverage-py

Ultimately I created a .coveragerc file which tells AndreMiras/coveralls-python-action@develop to ignore all errors when finishing coveralls. This resolves the issue and appears to be all right - it doesn't hide errors related to unit-tests for instance.

@antgonza antgonza merged commit 0601264 into biocore:master May 1, 2024
2 checks passed
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.

None yet

5 participants