-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #102 from CCBR/iss-99
create Docker containers and remove envmodules
- Loading branch information
Showing
59 changed files
with
1,525 additions
and
1,600 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| name: build | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - main | ||
| - develop | ||
| pull_request: | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| python-version: ["3.11"] | ||
| snakemake-version: ["7.32.3"] | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: mamba-org/setup-micromamba@v1 | ||
| with: | ||
| environment-name: build | ||
| cache-environment: true | ||
| condarc: | | ||
| channels: | ||
| - conda-forge | ||
| - bioconda | ||
| create-args: >- | ||
| python=${{ matrix.python-version }} | ||
| snakemake=${{ matrix.snakemake-version }} | ||
| setuptools | ||
| pip | ||
| pytest | ||
| - name: Test | ||
| run: | | ||
| python -m pytest | ||
| env: | ||
| TMPDIR: ${{ runner.temp }} | ||
| shell: micromamba-shell {0} |
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| name: Add issues/PRs to user projects | ||
|
|
||
| on: | ||
| issues: | ||
| types: | ||
| - assigned | ||
| pull_request: | ||
| types: | ||
| - assigned | ||
|
|
||
| jobs: | ||
| add-to-project: | ||
| uses: CCBR/.github/.github/workflows/auto-add-user-project.yml@v0.1.0 | ||
| secrets: inherit |
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| # CHARLIE development version | ||
|
|
||
| - Major updates to convert CHARLIE from a biowulf-specific to a platform-agnostic pipeline (#102, @kelly-sovacool): | ||
| - All rules now use containers instead of envmodules. | ||
| - Default config and cluster config files are provided for use on biowulf and FRCE. | ||
| - New entry `TEMPDIR` in the config file sets the temporary directory location for rules that require transient storage. | ||
| - New `--singcache` argument to provide a singularity cache dir location. The singularity cache dir is automatically set inside `/data/$USER/` or `$WORKDIR/` if `--singcache` is not provided. | ||
|
|
||
| # CHARLIE 0.10.1 | ||
|
|
||
| - strand are reported together, strand from all callers are reported, | ||
| - both + and - flanking sites are reported, | ||
| - rev-comp function updated, | ||
| - updated versions of tools to match available tools on BIOWULF. | ||
|
|
||
| # CHARLIE 0.9.0 | ||
|
|
||
| Significant upgrades since the last release: | ||
|
|
||
| - updates to wrapper script, many new arguments/options added | ||
| - new per-sample counts table format | ||
| - new all-sample master counts matrix with min-nreads filtering and ntools column to show number of tools supporting the circRNA call | ||
| - new version of Snakemake | ||
| - cluster_status script added for forced completion of pipeline upon TIMEOUTs | ||
| - updated flowchart from lucid charts | ||
| - added circRNAfinder, find_circ, circExplorer2_bwa and other tools | ||
| - optimized execution and resource requirements | ||
| - updated viral annotations (Thanks Sara!) | ||
| - new method to extract linear counts, create linear BAMs using circExplorer2 outputs | ||
| - new job reporting using jobby and its derivatives | ||
| - separated creation of BWA and BOWTIE2 index from creation of STAR index to speed things up | ||
| - parallelized find_circ | ||
| - better cleanup (eg. deleting \_STARgenome folders, etc.) for much smaller digital footprint | ||
| - multitude of comments throughout the snakefiles including listing of output file column descriptions | ||
| - preliminary GH actions added | ||
|
|
||
| # CHARLIE 0.7.0 | ||
|
|
||
| - 5 circRNA callers | ||
| - all-sample counts matrix with annotations | ||
|
|
||
| # CHARLIE 0.6.9 | ||
|
|
||
| - Optimized pysam scripts | ||
| - fixed premature completion of singularity rules | ||
|
|
||
| # CHARLIE 0.6.5 | ||
|
|
||
| - updated config.yaml to use the latest HSV-1 annotations received from Sarah (050421) | ||
|
|
||
| # CHARLIE 0.6.4 | ||
|
|
||
| - create linear reads BAM file | ||
| - create linear reads BigWigs for each region in the .regions file. | ||
|
|
||
| # CHARLIE 0.6.3 | ||
|
|
||
| - QOS not working for Taka... removed from cluster.json | ||
| - recall rule requires python/3.7 ... env module updated | ||
|
|
||
| # CHARLIE 0.6.2 | ||
|
|
||
| - BSJ files are in BSJ subfolder... bug fix for v0.6.1 | ||
|
|
||
| # CHARLIE 0.6.1 | ||
|
|
||
| - customBSJs recalled from STAR alignments | ||
| - only for PE | ||
| - removes erroneously called CircExplorer BSJs | ||
| - create sense and anti-sense BSJ BAMs and BW for each reference (host+viruses) | ||
| - find reads which contribute to CIRI BSJs but not on the STAR list of BSJ reads, see if they contribute to novel (not called by STAR) BSJs and append novel BSJs to customBSJ list | ||
|
|
||
| # CHARLIE 0.6.0 | ||
|
|
||
| cutadapt_min_length to cutadapt rule... setting it to 15 in config (for miRNAs, Biot and short viral features) |
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 0.10.1-dev |
Oops, something went wrong.