Skip to content

Commit 47d12a0

Browse files
ColelymanSnicker7mbowcut2
committed
Sam/paired processing (#120) (pinellolab#537)
* Implement crispresso_merge * Add new crispresso_merge to args * Update test_env.yml * Parallel * Fastq_out with single process only * Native merge tests * Remove unused aln_matrix * Fix get consensus from pairs stubs * Fix unit tests, upack 5 vasl * Update score * Update integration_tests.yml * Update tests, remove insertions beyond amplicon * Update tests, new score * Update for deletions * Update for deletions * Update scores * Update scores * Update scores * Fix fastq_output * f-string fix * CRISPResso_merge for core only * Comments * Unpin numpy<2 * Pin cython 3.0.12 * Pip install no isolation * numpy fix * Fix workflows * Write and read slots during parallelization * Delete unused test * Add run native merge test to github actions * Update c files with cython=3.1.0 * Remove import for ResultsSlotsDict * Repoint tests at master --------- Co-authored-by: Samuel Nichols <Snic9004@gmail.com> Co-authored-by: mbowcut2 <mbowcut@gmail.com>
1 parent 56ff6f0 commit 47d12a0

10 files changed

Lines changed: 17289 additions & 15984 deletions

File tree

.github/envs/test_env.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ dependencies:
1414
- scipy
1515
- matplotlib=3.8.4
1616
- pandas>2
17+
- pytest-check
1718
- pip:
1819
- ydiff

.github/workflows/integration_tests.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ jobs:
7979
run: |
8080
make prime-editor test print
8181
82+
- name: Run Native Merging
83+
if: success() || failure()
84+
run: |
85+
make nhej_native_merge test print
86+
8287
- name: Run BAM Input
8388
if: success() || failure()
8489
run: |

0 commit comments

Comments
 (0)