Repository navigation
Conversation
…rs in cargo test The two Python files ran the og binary on made-up AnnotSV tables and SV VCFs. Their checks move, by meaning and with the same inputs, into og-steps' integration tests, and the Python files go. Bead: D1
… in cargo test The join scenarios, the tag pass, the fixture delins and the split poly-A call move into og-clinvar's integration tests, which read tests/fixtures/vcf/combined_allele_*.vcf in place. The real step 06 run on the same fixtures stays with the e2e case clinvar-combined-allele-1, and the real 1/2 split with tests/test_isec_columns.sh. Bead: D1
…ldens in cargo test test_str_catalog.py moves into og-setup's integration tests: the pinned STRchive files and their checksum, the converter, Stranger on the built catalog and the extra repeats against GRCh38. They download and run docker, so they run in CI (CI set) or with OG_NET_TESTS=1. The meaning checks of test_rfc1_motif.py on og str motif's goldens move into og-bam's tests. test_str_ranges.py keeps the three helpers it imported from test_str_catalog.py, so test_str_catalog.py can go. Bead: D1
rustfmt and clippy on the moved tests, the CHANGELOG line, and the docs and comments that named the deleted files. Bead: D1
Each planted change must turn the moved cargo tests red in Guard's rust job: the join window at 0, the 1/. wording as het, Delly's depth gate off, no INVDUP_CANDIDATE, a renamed ORIG_SVLEN header, CNVpytor calls named cnv, a 10% common-AF line, the MHC row gone, a far pathogenic minimum and short-read limit in og str catalog, UGT1A1's region shifted, and three RFC1 goldens rewritten. Bead: D1
|
Warning Review limit reachedYou've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository. Next included review available in 25 minutes. View limit details
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. |
Reverts ac45187. The planted faults turned the moved tests red in Guard's rust job on that head; this head carries none of them. Bead: D1
…nvar-str # Conflicts: # CHANGELOG.md
Collaborator
Author
|
@coderabbitai review |
Action not completed
|
This branch has not been deployed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Part of #411. Settles owner decision D1 for this package: Python must go for 1.0.0.
Problem
Five Python files tested the SV, ClinVar and repeat tools by running the
ogbinary:og sv postfilter,og sv inv-filter,og sv svlen-fix,og sv add-callers,og clinvar join-adjacent,og clinvar hits,og clinvar deep-intronic,og str catalogand the RFC1 goldens ofog str motif. That is about 1,880 lines of Python that test Rust code. They ran outsidecargo test, so a change to a crate did not run its own checks in the crate's test run.Fix
The checks move into the crates that own the tools, as integration tests. They keep the same inputs, the same assertions and the same red controls:
tests/test_annotsv_postfilter.py(exon edges, population AF, caller, consensus support, the command line, rule table, depth check by sex and PAR, and their controls)rust/crates/og-steps/tests/sv_postfilter.rstests/test_annotsv_sv_inputs.py(inv-filter, svlen-fix, add-callers, Delly read depth, and their controls)rust/crates/og-steps/tests/sv_inputs.rstests/test_clinvar_join_adjacent.pychecks 1 to 7 (the join scenarios, the window's edge, the tag pass)rust/crates/og-clinvar/tests/port_tests_sv_clinvar_str_join.rstests/fixtures/vcf/combined_allele_{sample,clinvar}.vcf, read in place, in the same Rust file. The real step 06 with bcftools on these fixtures is the e2e caseclinvar-combined-allele-1, which asserts the same hits.og clinvar hitsandog clinvar deep-intronicon the calls as step 06's bcftools writes them, in the same Rust file. The real 1/2 split through step 06 stays intests/test_isec_columns.sh.tests/test_str_catalog.py(pinned STRchive files and their checksum, the converter, Stranger on the catalog, the extra repeats against GRCh38, and their controls)rust/crates/og-setup/tests/strchive_catalog.rstests/test_rfc1_motif.py(what the RFC1 goldens must say)rust/crates/og-bam/tests/motif_meaning.rsThe Python files of the first four rows are deleted. Decisions, each the smallest change that keeps main true:
tests/test_rfc1_motif.pystays for now. Three e2e cases (expansions-and-rfc1-1-motif,str-catalog-1-strchive,nextflow-report-parity-1-sections) andrust/crates/og-bam/tests/make_parity.pyimport its read sets. test(e2e): build genotype and repeat e2e inputs without inline Python #442 moves two of those cases off it; the other importers belong to later lanes. The file goes when its last importer does.tests/test_str_ranges.pyimported three helpers fromtests/test_str_catalog.py. It now holds them itself, unchanged, so the catalog file can go. A later lane movestest_str_ranges.pyinto Rust.CIis set (Guard's rust job) or withOG_NET_TESTS=1. Elsewhere each prints that it skipped. In CI a failed download or a missing docker fails the test.test_isec_columns.sh. Guard'scargo testruns beforeogis built for the containers, so a cargo test cannot run step 06.No output, option or file name changes.
Files outside the package list, edited only to keep docs true to the deletion:
tests/test_str_ranges.py(the helpers),docs/06-clinvar-screen.md,docs/09-str-expansions.md,docs/testing.md,tests/fixtures/vcf/README.mdandtests/parity/gen/clinvar-cases.sh(each named a deleted file), andCHANGELOG.md(one line).How it was checked
cargo test -p og-steps --test sv_postfilter --test sv_inputs,-p og-clinvar --test port_tests_sv_clinvar_str_join,-p og-bam --test motif_meaning, and-p og-setup --test strchive_catalogwithOG_NET_TESTS=1(Stranger 0.10.2 in docker, the pinned STRchive files and NCBI GRCh38).cargo fmt --check,cargo clippy --all-targets --all-features -D warningsandcargo doc -D warningsare clean.tests/test_str_ranges.pypasses with a freshogandOG_REQUIRED=1.og str catalog, UGT1A1's region shifted, three RFC1 goldens rewritten). Guard'scargo test --workspace --no-fail-fastwent red in every moved file:sv_postfilter5 of 5,sv_inputs4 of 4,port_tests_sv_clinvar_str_join4 of 4,motif_meaning3 of 3,strchive_catalog3 of 4 (the pinned-checksum test has no planted fault). https://github.com/GeiserX/OwnGenome/actions/runs/43745446386/job/132907615914 The next commit, 7863122, reverts it; its tree equals the tree before the plant.strchive_catalog4 of 4 in 6 s). https://github.com/GeiserX/OwnGenome/actions/runs/43749275443/job/132935403534 The other fast checks (unit tests, parity, fake-docker, Rust, Lint, Nextflow, Docs, Container Test, Personal data) are green on the same head.Closes bead D1 for this package (the Python tests of the SV, ClinVar and repeat tools).