Skip to content

Commit 2d66c98

Browse files
Refactored SPP plugin w/tellread support. (#92)
* Updated to support changes to submit_job. Updated to support recent changes to Job.submit_job(). These changes allow for submitting multiple Slurm jobs in parallel and waiting on 1+ jobs until they complete or terminate. Added basic support for TellRead. * Updated * point to add_tellread branch of mg-scripts * WIP: Refactored qp-klp plugin to support new pipelines Refactored qp-klp plugin using mixins to break up tellseq.sh into components and support a version 2.0 Tellread workflow in mg-scripts. klp.py needs more cleanup and the tests need to be refactored. All references to Step in klp need to be replaced. The actual execute_pipeline() function for TellSeq Workflow() needs to be pasted from StandardMetagenomicWorkflow() and modified to use the new TellReadJob() class in mg-scripts. * Update git w/latest on Workflows * klp updated to use new classes, streamlined * Added tests for Workflow creation using factory class. Updated Assays and Instruments for Amplicon and TellSeq workflows. * Reorganized sample input files into folders. Reorganized sample input files into folders to allow for easier naming. * Revamping existing tests * Revamping NuQCJob tests * New tests exercise ConvertJob and NuQCJob * Updates from this week * Updated Amplicon quality control test. * Address test fail on MacOS vs Linux * Updates * Pre-test push * Checkpoint * checkpoint2 * Code audit * All tests are passing again post metapool + mgscripts updates * flake8 * smaller dummy files * update test * Updates * Removed TODOs * Updates * Some updates based on feedback * Removing .DS_Store * Updates based on feedback * Updates based on feedback * Updates based on testing * Updates based on feedback
1 parent 1cd30c4 commit 2d66c98

39 files changed

+6275
-3425
lines changed

.github/workflows/qiita-plugin-ci.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ jobs:
7979
# seqtk is a conda-installed requirement for metapool and isn't
8080
# installed automatically by its setup.py.
8181
conda config --add channels bioconda
82-
conda create -q --yes -n klp python=3.9 seqtk
82+
conda create -q --yes -n klp python=3.9 'seqtk>=1.4'
83+
8384
conda activate klp
8485
8586
export QIITA_SERVER_CERT=`pwd`/qiita-dev/qiita_core/support_files/server.crt

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies = [
3636
"pandas",
3737
"qiita-files@https://github.com/qiita-spots/qiita-files/archive/master.zip",
3838
"qiita_client@https://github.com/qiita-spots/qiita_client/archive/master.zip",
39-
"sequence-processing-pipeline@https://github.com/biocore/mg-scripts/archive/master.zip",
39+
"sequence-processing-pipeline@https://github.com/biocore/mg-scripts/archive/master.zip"
4040
]
4141
[project.scripts]
4242
configure_klp = "qp_klp.scripts.configure_klp:config"

qp_klp/Amplicon.py

-128
This file was deleted.

0 commit comments

Comments
 (0)