diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..65f6ba3 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,25 @@ +## Changes + + + +## Issues + + + + + +## PR Checklist + +(~Strikethrough~ any points that are not applicable.) + +- [ ] This comment contains a description of changes with justifications, with any relevant issues linked. +- [ ] Update docs if there are any API changes. +- [ ] Update `CHANGELOG.md` with a short description of any user-facing changes and reference the PR number. Guidelines: https://keepachangelog.com/en/1.1.0/ diff --git a/.github/workflows/sync-fork.yml b/.github/workflows/sync-fork.yml deleted file mode 100644 index df759ea..0000000 --- a/.github/workflows/sync-fork.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Sync Fork - -on: - schedule: - - cron: '0 0 * * *' # once every day - workflow_dispatch: # on button click - push: - paths: - - .github/workflows/sync-fork.yml - -env: - GH_TOKEN: ${{ github.token }} - FORK_OWNER: NCIPangea - UPSTREAM_OWNER: CCBR - -jobs: - sync: - runs-on: ubuntu-latest - steps: - - name: get repo name - # required for actions scheduled via cron, as github.event.repository.name won't work - run: | - echo "REPO=$(basename ${{ github.repository }})" >> $GITHUB_ENV - - name: sync fork - # only run this action from the forked repo - if: ${{ github.repository_owner == env.FORK_OWNER }} - run: | - gh repo sync ${{ github.repository }} --source $UPSTREAM_OWNER/$REPO --force diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 946913a..d080605 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,11 +1,24 @@ +default_install_hook_types: [pre-commit, commit-msg] +default_stages: [pre-commit] +exclude: | + (?x)( + ^assets/| + ^docs/.*.html| + ^_extensions/ + ) repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v1.2.3 hooks: - id: check-added-large-files - #- id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace + # spell check + - repo: https://github.com/codespell-project/codespell + rev: v2.2.4 + hooks: + - id: codespell + # https://github.com/codespell-project/codespell/issues/1498 # Python formatting - repo: https://github.com/psf/black rev: 23.7.0 @@ -21,13 +34,14 @@ repos: rev: v2.7.1 hooks: - id: prettier - # spell check - - repo: https://github.com/codespell-project/codespell - rev: v2.2.4 - hooks: - - id: codespell # enforce commit format - repo: https://github.com/compilerla/conventional-pre-commit rev: v2.3.0 hooks: - id: conventional-pre-commit + stages: [commit-msg] + args: [] + - repo: https://github.com/citation-file-format/cffconvert + rev: 054bda51dbe278b3e86f27c890e3f3ac877d616c + hooks: + - id: validate-cff diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..a9cedaf --- /dev/null +++ b/.prettierignore @@ -0,0 +1,9 @@ +# gitignore +.nextflow* +work/ +data/ +results/ +.DS_Store +*.code-workspace +assets/*.html +_extensions diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..d04c3f1 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +overrides: + - files: "*.md" + options: + tabWidth: 2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 105f84a..d31dce6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## development version +## v2.5.9 + - Fix bugs that prevented single-end data from running through the pipeline. (#58, @kelly-sovacool) - Increase wall time for kraken and bbmerge rules. (#68, @slsevilla) diff --git a/VERSION b/VERSION index ecd7ee5..96b53a3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.8 +2.5.9-dev diff --git a/resources/cluster.json b/resources/cluster.json index b22bfd6..5869c03 100644 --- a/resources/cluster.json +++ b/resources/cluster.json @@ -10,8 +10,8 @@ "error": "logfiles/slurmfiles/${{SLURM_JOBID}}.%j.{rule}.{wildcards}.err" }, "bbmerge": { - "mem": "64g" - "time": "1-00:00:00" + "mem": "64g", + "time": "1-00:00:00" }, "fastqc": { "threads": "32", @@ -28,13 +28,13 @@ "kraken_pe": { "cpus-per-task": "32", "gres": "lscratch:256", - "mem": "110g" + "mem": "110g", "time": "1-00:00:00" }, "kraken_se": { "cpus-per-task": "32", "gres": "lscratch:256", - "mem": "110g" + "mem": "110g", "time": "1-00:00:00" }, "pca": {