Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release 2.0 #225

Merged
merged 227 commits into from
Feb 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
227 commits
Select commit Hold shift + click to select a range
681f308
init autometa 2
evanroyrees Nov 19, 2019
bb9501f
added template classes from autometa class diagram discussion
evanroyrees Nov 19, 2019
87b71c3
autometa 1.0 refactored. New cli and beginnings of User API. markers …
evanroyrees Jan 22, 2020
f699c8a
updated markers links and link to test_metagenome.config
evanroyrees Jan 22, 2020
c2e9a72
removed unneeded class diagram doc and edit test config to display re…
evanroyrees Jan 23, 2020
7787015
bugfix to get_kingdoms assigning self.taxonomy using self.assign_taxo…
evanroyrees Jan 23, 2020
c85ca0c
updates to suppress parallel warnings when running prodigal. updated …
evanroyrees Jan 23, 2020
5135b30
added coverage calculation handling for reads,sam,bam and bed files. …
evanroyrees Jan 23, 2020
889e4a0
updated logger to DEBUG for majority_vote.py updated argparse help fo…
evanroyrees Jan 23, 2020
2a5c4c2
updates to autometa configuration. Added kingdom arg to tune for only…
evanroyrees Jan 24, 2020
148dfc7
suppressed parallel warnings when running hmmscan
evanroyrees Jan 24, 2020
472a1f2
bugfix to parallel warning supression for hmmscan
evanroyrees Jan 24, 2020
681b249
bugfix to orf calling in metagenome.py
evanroyrees Jan 27, 2020
d8a5847
upadted default config to handle coverage calculation files
evanroyrees Jan 27, 2020
1b8636d
update files in default.config
evanroyrees Jan 28, 2020
020e8f8
Add django-related files, clean up structure
chanana Feb 2, 2020
be8b110
Merge branch 'dev' of github.com:WiscEvan/Autometa into dev
chanana Feb 2, 2020
997a242
Update ignore, force recache of un-ignored files
chanana Feb 2, 2020
1ae0e58
Update ignore, force recache of un-ignored files
chanana Feb 2, 2020
7bf9979
Add vscode ignorance
chanana Feb 2, 2020
bc8fd44
Add vscode ignorance
chanana Feb 2, 2020
6e14c6c
Begin django website dev
chanana Feb 2, 2020
8f754a0
Begin django website dev
chanana Feb 2, 2020
62f4374
Restart website, add first app
chanana Feb 2, 2020
31cb676
Restart website, add first app
chanana Feb 2, 2020
660a743
Make startpage
chanana Feb 2, 2020
b7cc375
Make startpage
chanana Feb 2, 2020
bdad8cf
Delete website; confusing naming
chanana Feb 2, 2020
88d3db5
Delete website; confusing naming
chanana Feb 2, 2020
7ea85af
Start new django website
chanana Feb 2, 2020
7e38e55
Start new django website
chanana Feb 2, 2020
d6c25ce
Create startpage
chanana Feb 2, 2020
2780549
Create startpage
chanana Feb 2, 2020
3337e79
bugfix to hmmer marker filtering (filepath handling). minor logging e…
evanroyrees Feb 4, 2020
aa1dbc1
Add startpage
chanana Feb 4, 2020
28fabf9
Add startpage
chanana Feb 4, 2020
1ef067b
Merge branch 'dev' of github.com:WiscEvan/Autometa into dev
chanana Feb 4, 2020
de620c8
Merge branch 'dev' of github.com:WiscEvan/Autometa into dev
chanana Feb 4, 2020
c2c5202
Add template, css, bootstrap
chanana Feb 4, 2020
54f9e2a
Add template, css, bootstrap
chanana Feb 4, 2020
0270bf1
Fix links, add nav-bar, css
chanana Feb 4, 2020
ecb1476
Fix links, add nav-bar, css
chanana Feb 4, 2020
4d7c87b
Change blog template to autometa related terms
chanana Feb 4, 2020
619baf8
Change blog template to autometa related terms
chanana Feb 4, 2020
cc2d595
Add Projects and Jobs as Models
chanana Feb 6, 2020
335b563
Add Projects and Jobs as Models
chanana Feb 6, 2020
4ec643d
Add login logout profile pages
chanana Feb 6, 2020
8252fba
Add login logout profile pages
chanana Feb 6, 2020
cbb42d4
Use conda env instead of pip
chanana Feb 6, 2020
a14c37c
Use conda env instead of pip
chanana Feb 6, 2020
4426238
Revert "Use conda env instead of pip"
evanroyrees Feb 7, 2020
76a4f2c
Revert "Add login logout profile pages"
evanroyrees Feb 7, 2020
cc8a95e
Revert "Add Projects and Jobs as Models"
evanroyrees Feb 7, 2020
517822b
Revert "Change blog template to autometa related terms"
evanroyrees Feb 7, 2020
3479847
Revert "Fix links, add nav-bar, css"
evanroyrees Feb 7, 2020
6292b0f
Revert "Add template, css, bootstrap"
evanroyrees Feb 7, 2020
4726e84
Revert "Merge branch 'dev' of github.com:WiscEvan/Autometa into dev"
evanroyrees Feb 7, 2020
757895e
Revert "Add startpage"
evanroyrees Feb 7, 2020
cb81c34
removed website dir and files (secrets published)
evanroyrees Feb 7, 2020
ca51fc7
Revert "Use conda env instead of pip"
evanroyrees Feb 7, 2020
dee682e
Revert "Add login logout profile pages"
evanroyrees Feb 7, 2020
076d218
Revert "Add Projects and Jobs as Models"
evanroyrees Feb 7, 2020
6d18b4f
Revert "Change blog template to autometa related terms"
evanroyrees Feb 7, 2020
1c38cdc
Revert "Fix links, add nav-bar, css"
evanroyrees Feb 7, 2020
44db54a
Revert "Add template, css, bootstrap"
evanroyrees Feb 7, 2020
82db99b
Revert "Merge branch 'dev' of github.com:WiscEvan/Autometa into dev"
evanroyrees Feb 7, 2020
add113d
Revert "Add startpage"
evanroyrees Feb 7, 2020
2e2d4d7
removed website dir and files (secrets published)
evanroyrees Feb 7, 2020
99ca2a3
Merge branch 'dev' of https://github.com/KwanLab/Autometa into dev
evanroyrees Feb 10, 2020
027d987
updated directory structure, README.md, moved tests to their own dire…
evanroyrees Feb 11, 2020
3a22fdf
Added checkpointing functionality in utilities.py. updated config to …
evanroyrees Mar 3, 2020
9eda737
updated prodigal parsing into marker retrieval algorithm (markers.py …
evanroyrees Mar 3, 2020
83109f3
Merge pull request #8 from WiscEvan/dev
jason-c-kwan Mar 5, 2020
3c2ef35
resolved #10 Contributors added and copyright year updated to 2020.
evanroyrees Mar 5, 2020
01a432d
resolved #10 Contributors added and copyright year updated to 2020.
evanroyrees Mar 5, 2020
1d8982c
Merge branch 'master' of https://github.com/KwanLab/Autometa into dev
evanroyrees Mar 5, 2020
d53fb03
Resolves KwanLab/Autometa#16, Resolves KwanLab/Autometa#17 and simpli…
evanroyrees Mar 11, 2020
31e0e2f
fixed merge conflicts
evanroyrees Mar 11, 2020
b71e813
updates to project configuration handling metagenome numbering. Now r…
evanroyrees Mar 12, 2020
2b812da
significant simplification in API. Created Databases class in databas…
evanroyrees Mar 13, 2020
caeb6f9
updates to check dependencies and control of debugging information wh…
evanroyrees Mar 15, 2020
138c273
updated 'get_versions' function to return the version string if a pro…
evanroyrees Mar 15, 2020
ea282d1
hotfix to case where new project does not contain any metagenomes. sk…
evanroyrees Mar 15, 2020
ee1fbec
Changed OSError to subclass ChildProcessError in prodigal.py. This is…
evanroyrees Mar 16, 2020
bbfaecd
mostly resolves KwanLab/Autometa#21 and resolves KwanLab/Autometa#18.
evanroyrees Mar 17, 2020
ca64a2f
resolved #19 added docstring, fixed nproc and removed depth function
Sidduppal Mar 18, 2020
bc390bc
Revert "resolved #19, did not add the copyright and liscence informat…
Sidduppal Mar 18, 2020
30054c3
resolved #19 added docstring (and liscence), fixed nproc and removed …
Sidduppal Mar 18, 2020
7083be8
resolved #19 made the improvements as suggested by Evan
Sidduppal Mar 18, 2020
1ccbca5
resolved #19 made the improvements_2 as suggested by Evan
Sidduppal Mar 18, 2020
e7680e6
resolved #19 made change bam.file to alignment.bam file
Sidduppal Mar 18, 2020
33231c3
resolved #19 improved the cmd function
Sidduppal Mar 19, 2020
5c73579
fix to extract contigs from orf_ids using specific prodigal version. …
evanroyrees Mar 19, 2020
1360c4d
resolved #19 removed run function, removed intermedediate files and r…
Sidduppal Mar 21, 2020
bd007a8
updated pandas numpy module call for nan to pd.NA from pandas version…
evanroyrees Mar 23, 2020
c63e431
resolved #19 all intermediate files are now being deleted, added addi…
Sidduppal Mar 24, 2020
2e131a5
resolved #19 removed 'tail' from variable name, raise TypeError is np…
Sidduppal Mar 24, 2020
4688efb
update to docstrings added new file key in config and comma-delimited…
evanroyrees Mar 24, 2020
406041b
returning from main rather than unnecessary sys import.
evanroyrees Mar 24, 2020
7afe496
resolved #19 Temporary directory will now be delted under any circums…
Sidduppal Mar 25, 2020
9a81d52
Merge pull request #25 from WiscEvan/dev
jason-c-kwan Mar 26, 2020
ccab467
resolved #19 added FileNotFoundError, addressed other variable name i…
Sidduppal Mar 26, 2020
8e1773e
Merge branch 'dev' into dev
jason-c-kwan Mar 26, 2020
d7b2302
resolved #19 added docstring, fixed nproc and removed depth function
Sidduppal Mar 18, 2020
21ccc9e
Revert "resolved #19, did not add the copyright and liscence informat…
Sidduppal Mar 18, 2020
666d9e2
resolved #19 added docstring (and liscence), fixed nproc and removed …
Sidduppal Mar 18, 2020
409818b
resolved #19 made the improvements as suggested by Evan
Sidduppal Mar 18, 2020
46adfdb
resolved #19 made the improvements_2 as suggested by Evan
Sidduppal Mar 18, 2020
8f7a6ee
resolved #19 made change bam.file to alignment.bam file
Sidduppal Mar 18, 2020
00b3591
resolved #19 improved the cmd function
Sidduppal Mar 19, 2020
8060943
resolved #19 removed run function, removed intermedediate files and r…
Sidduppal Mar 21, 2020
d5744fa
resolved #19 all intermediate files are now being deleted, added addi…
Sidduppal Mar 24, 2020
359cd25
resolved #19 removed 'tail' from variable name, raise TypeError is np…
Sidduppal Mar 24, 2020
69b5798
resolved #19 Temporary directory will now be delted under any circums…
Sidduppal Mar 25, 2020
5cbd2fc
resolved #19 added FileNotFoundError, addressed other variable name i…
Sidduppal Mar 26, 2020
43b67d9
Merge branch 'dev' of https://github.com/Sidduppal/Autometa into dev
evanroyrees Mar 26, 2020
5994120
Documentation (#34)
Sidduppal Apr 3, 2020
04f25f4
Issue #5 Working conda recipe (#38)
evanroyrees Apr 12, 2020
ee0378d
bug found in logger message within func where args was being passed. …
evanroyrees Apr 15, 2020
d06a33b
fixes #2 (#47)
evanroyrees Apr 16, 2020
3e8c771
Contributing Guidelines (#50)
evanroyrees Apr 21, 2020
bee13cc
Add entrypoint functionality. Update docstrings.
evanroyrees May 5, 2020
b06178b
Update MAG class to MetaBin.
evanroyrees May 5, 2020
3a9f2ff
:art::memo::green_heart: Add Markers class documentation. (#62)
evanroyrees May 6, 2020
53605e8
:art::memo: Rename --debug to --verbose flag (#63)
evanroyrees May 6, 2020
962121f
:art::memo: Add functionality to bin without taxonomy. Update docstri…
evanroyrees May 6, 2020
df014c7
Add Documentation. Add readthedocs.org integration (#45)
Sidduppal May 6, 2020
913958f
Remove merge conflict resolution lines (Fixes #68) (#69)
evanroyrees May 6, 2020
7c65a96
Add mock import of modules and link to contribution guidelines (fixes…
Sidduppal May 6, 2020
3510cb8
Add docs badge
evanroyrees May 6, 2020
42c6bdf
Update README.md
evanroyrees May 6, 2020
4fc691d
:art: :racehorse: Resolves #55 (#76)
Sidduppal May 13, 2020
8b98e7e
Merge branch 'dev' of https://github.com/KwanLab/Autometa into issue-#54
evanroyrees May 13, 2020
6a49307
:memo: Add docstrings to class properties.
evanroyrees May 13, 2020
fe84654
Merge branch 'issue-#54' of https://github.com/WiscEvan/Autometa into…
evanroyrees May 13, 2020
3033b0d
:memo: Update describe property GC statement.
evanroyrees May 13, 2020
1c051e4
fixes-#54 Metagenome (#66)
evanroyrees May 14, 2020
587c873
Resolved merge conflicts with WiscEvan-issue-#53
jason-c-kwan May 14, 2020
d0cc81f
Merge branch 'WiscEvan-issue-#53' into dev
jason-c-kwan May 14, 2020
6b604fc
hmmer (#72)
Sidduppal May 14, 2020
9ee51dd
:memo::art::fire: Add docstrings to LCA class. (#78)
evanroyrees May 14, 2020
8879412
Fix writing (#82)
evanroyrees May 14, 2020
ddc2bf9
Update majority_vote (#81)
evanroyrees May 15, 2020
67387c5
pre-commit hooks (#92)
evanroyrees Jun 18, 2020
16bfca4
prodigal and hmmer verbose bug (#90)
evanroyrees Jun 18, 2020
10571c4
Recursive DBSCAN (#84)
evanroyrees Jun 19, 2020
fe2dcb9
databases and utilities (#77)
evanroyrees Jun 22, 2020
48c06bd
Rank-specific binning (#96)
evanroyrees Jun 23, 2020
a2ed6ca
diamond.py (#87)
Sidduppal Jun 23, 2020
aaa7ff5
Add support request issue template. (#97)
evanroyrees Jun 24, 2020
067bb82
ncbi.py (#83)
Sidduppal Sep 3, 2020
abdc5b2
Samtools (#103)
Sidduppal Sep 3, 2020
146b027
Binning stats/taxonomy summary (#99)
evanroyrees Sep 9, 2020
7c6a080
decision tree classifier (#100)
evanroyrees Sep 9, 2020
8ebdb8e
Fix config and setup of user project (#104)
evanroyrees Sep 13, 2020
79869f9
Update project docstrings (#108)
evanroyrees Sep 15, 2020
269e9ac
CI/CD (#101)
evanroyrees Feb 22, 2021
fa87431
:bug: Change > to >= when calculating N50 (#119)
chasemc Feb 23, 2021
18fd38e
Update README.md
evanroyrees Mar 8, 2021
a1c97a8
Update README.md
evanroyrees Mar 8, 2021
06f5e65
Fix Dockerfile (#123)
evanroyrees Mar 11, 2021
4226f72
:art: Add support for gzipped assemblies (#129)
evanroyrees Mar 12, 2021
2b0e150
:memo: Update bug report template (#130)
evanroyrees Mar 12, 2021
91d2eec
Remove --multiprocess from autometa-kmers entrypoint (#127)
evanroyrees Mar 12, 2021
5cccf75
Add GC content std.dev. limit and coverage std. dev. limit Binning me…
evanroyrees Mar 16, 2021
50f7a60
Nextflow implementation template (#118)
evanroyrees Apr 17, 2021
4f98acc
Update documentation (#121)
Sidduppal Jun 24, 2021
8a64e7a
Add feature to download google drive datasets (#138)
ajlail98 Aug 5, 2021
7c9d02f
Add densmap embed method and fix binning-summary cluster column bug (…
evanroyrees Sep 21, 2021
5872fb0
Classification and Clustering Benchmarking (#141)
evanroyrees Sep 24, 2021
92179f5
Nfcore and structuring modules for collaboration (#157)
chasemc Sep 28, 2021
f372b82
Delete .gitattribute - there is a .gitattributes (#190)
chasemc Sep 28, 2021
2480782
:fire::green_apple: Remove duplicate standard slurm profiles (#195)
evanroyrees Dec 2, 2021
36d52b1
Fix import error in databases.py (#194)
evanroyrees Dec 2, 2021
6198205
Fix/Create mock data subworkflow (#206)
chasemc Jan 5, 2022
c82ecb7
:whale::bug: Fix failing docker build (#213)
evanroyrees Jan 5, 2022
4ca0a20
:memo: Update Documentation (#212)
evanroyrees Jan 5, 2022
ca6139b
:art: Add typehints to diamond.py and update kmers docstring (#208)
evanroyrees Jan 5, 2022
7409080
:art::snake: Add specific parsers for domtblout and tblout for hmmsca…
evanroyrees Jan 6, 2022
b19cce5
:art::bug: Check whether output directory exists (and make if it does…
evanroyrees Jan 6, 2022
9bfb62f
Fix bedtools genomecov deprecation (coverage calculation) (#209)
evanroyrees Jan 6, 2022
12eda38
:art:🐚 Add bash-implementations of Autometa workflows (#202)
evanroyrees Jan 6, 2022
ec822cf
Nextflow documentation (#184)
chasemc Jan 7, 2022
974d324
:fire::memo: Reformat benchmarking docs (#215)
evanroyrees Jan 7, 2022
cf23ce3
Refactor autometa-taxonomy-lca (#211)
evanroyrees Jan 12, 2022
3c65a57
:art::whale: Replace jason-c-kwan with jasonkwan for docker images (#…
evanroyrees Jan 12, 2022
c405d84
Update mock_data_reporter.Dockerfile (#220)
chasemc Jan 19, 2022
9918f94
:whale::green_heart::memo: Add docker CI and update links (#216)
evanroyrees Jan 19, 2022
bbb5073
Point to LICENSE (#222)
chasemc Jan 19, 2022
325172e
Add check for nr.dmnd and nr.gz (#221)
chasemc Jan 19, 2022
bdbffda
🍏 Change Nextflow I/O behavior (#218)
evanroyrees Jan 19, 2022
5931255
:green_apple::art: add/update coverage handling (#223)
evanroyrees Jan 24, 2022
832734c
:snake:🐎 Large data mode (#207)
evanroyrees Jan 24, 2022
2ddfb22
Merge main into dev (#224)
evanroyrees Jan 24, 2022
23fb3de
:art: Change dev to main
evanroyrees Jan 24, 2022
db2c1f7
:art: merge main
evanroyrees Jan 24, 2022
e704e8f
:art::memo::green_apple: Update help text and icons for nf-core/autom…
evanroyrees Jan 24, 2022
80d691f
:fire: Fix minor typos
evanroyrees Jan 24, 2022
600f5e2
:snake::art::bug: Fix argparse params for recursive_dbscan.py and sum…
evanroyrees Jan 25, 2022
4432dcc
Merge branch 'release-2.0.0' of github.com:KwanLab/Autometa into rele…
evanroyrees Jan 25, 2022
6579f90
pytest & codecov CI (#227)
evanroyrees Jan 25, 2022
d9a891d
Refactor samplesheet (#228)
evanroyrees Jan 26, 2022
2344315
:art::memo: Add mentions of downloading bash workflow templates in ge…
evanroyrees Jan 26, 2022
9dcc929
:memo::bug: Fix code-blocks for downloading bash workflow templates
evanroyrees Jan 26, 2022
f823fe3
:art::bug: Fix broken links
evanroyrees Jan 26, 2022
9a641b3
:bug::art::memo: Update broken links previously pointing to main now …
evanroyrees Jan 27, 2022
049ff7c
:art::memo: Change links from dev branch to main branch for release
evanroyrees Jan 27, 2022
6f82748
:fire::memo: Fix typos in additional parameters section
evanroyrees Jan 27, 2022
b31e2a5
:art::memo: Add extra caution in running the pipeline section :green_…
evanroyrees Jan 27, 2022
4eb454d
:art::memo::fire: Remove redunant mentions of Autometa
evanroyrees Jan 27, 2022
4e3a388
:memo: Update links from dev to main
evanroyrees Jan 27, 2022
d905269
:art::memo: Update caution of samplesheet inputs with table
evanroyrees Jan 27, 2022
8fb412d
:bug::fire::memo: Fix malformed table in caution for samplesheet section
evanroyrees Jan 27, 2022
1c0229d
🐛 🎨 🍏 Fix kingdom-handling and mounting NCBI databases into docker c…
evanroyrees Jan 30, 2022
41634fc
Merge branch 'dev' of github.com:KwanLab/Autometa into release-2.0.0
evanroyrees Jan 31, 2022
8038a3b
:art::memo: Fix broken links and typos
evanroyrees Jan 31, 2022
4641b20
:green_apple::arrow_up: Pin nf-core to 2.1
evanroyrees Jan 31, 2022
c19b75e
:art::bug::green_apple: Add logic to only retrieve ncbi dirpath if it…
evanroyrees Jan 31, 2022
6b9e465
:art::green_apple: Rename autometa.nf workflow processes
evanroyrees Jan 31, 2022
c0d826c
:art::green_apple: Add comments to channel instantiation
evanroyrees Jan 31, 2022
136566a
:art::bug::fire::green_apple: Replace ncbi channel to file as channel…
evanroyrees Jan 31, 2022
b38ab9a
:art::green_apple: Update tag info for normalize_kmers and embed_kmers
evanroyrees Jan 31, 2022
1b70a6a
:art::memo::green_apple: sync release-2.0.0 fixes with dev. Update re…
evanroyrees Jan 31, 2022
9244988
Add error handling strategies for nextflow processes (#231)
evanroyrees Feb 1, 2022
a0546be
:memo: synchronize dev with release and update links for main branch
evanroyrees Feb 1, 2022
32b5d90
:art::snake: Add typehints and make output directory prior to attempt…
evanroyrees Feb 7, 2022
2a93c07
Merge branch 'dev' of github.com:KwanLab/Autometa into release-2.0.0
evanroyrees Feb 7, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .condarc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
channels:
- defaults
- bioconda
- conda-forge
show_channels_urls: True
default_threads: 6
23 changes: 23 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Ignore some root directory files unnecessarily expanding image (and context) size
.git
docs
autometa.mf
MANIFEST.in
LICENSE.txt
meta.yaml
# Ignore tests related files
pytest.ini
tests
make_test_data.py
# Ignore nextflow related files
autometa.nf
nextflow
nextflow.config
pipeline_info
# Ignore any files/directories built from source
dist
Autometa.egg-info
# Ignore databases
autometa/databases
!autometa/databases/markers
/work
24 changes: 24 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_size = 4
indent_style = space

[*.{yml,yaml}]
indent_size = 2

# These files are edited and tested upstream in nf-core/modules
[/modules/nf-core/**]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset

[/assets/email*]
indent_size = unset
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.config linguist-language=nextflow
modules/nf-core/** linguist-generated
subworkflows/nf-core/** linguist-generated
6 changes: 6 additions & 0 deletions .github/.dockstore.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Dockstore config version, not pipeline version
version: 1.2
workflows:
- subclass: nfl
primaryDescriptorPath: /nextflow.config
publish: True
131 changes: 83 additions & 48 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Contributing Guidelines
=======================
# Contributing Guidelines

First off, thanks for taking the time to contribute! :clap::+1::tada:

Expand All @@ -8,40 +7,75 @@ First off, thanks for taking the time to contribute! :clap::+1::tada:
[Contributing Code](#contributing-code)

[How Can I Contribute?](#how-can-i-contribute)
* [Reporting Bugs](#reporting-bugs)
* [Suggesting Enhancements](#suggesting-enhancements)
* [Submitting pull requests](#pull-requests)

- [Reporting Bugs](#reporting-bugs)
- [Suggesting Enhancements](#suggesting-enhancements)
- [Submitting pull requests](#pull-requests)

[Style guides](#style-guides)
* [git commit messages](#git-commit-messages)
* [documentation style guide](#documentation-style-guide)
* [python style guide](#python-style-guide)

### Contributing Code
- [git commit messages](#git-commit-messages)
- [documentation style guide](#documentation-style-guide)
- [python style guide](#python-style-guide)

1. Fork the KwanLab Autometa repository. You can do this [here](https://github.com/KwanLab/Autometa).
2. <details><summary>Add the KwanLab as the upstream remote.</summary><code>
git remote add upstream https://github.com/KwanLab/Autometa.git</code></details>
3. Update your local repository with the most recent updates from the Kwan Lab.
- <details><summary>Update your local repository.</summary><code>git pull upstream master</code></details>
- <details><summary>Push changes to update your remote repository.</summary><code>git push origin master</code></details>
4. <details><summary>Check out a branch corresponding to the feature you wish to add.</summary><code>git checkout -b your-new-feature master</code></details>
5. File an issue with the feature you plan on adding. This will open a channel of
communication with the core developers. See [suggesting enhancements](#suggesting-enhancements) for details.
6. Submit a pull request! To submit a pull request - see [instructions below](#pull-requests).
### Contributing Code

1. File an issue with the feature you plan on adding. This will open a channel of
communication with the core developers. See [suggesting enhancements](#suggesting-enhancements) for details.

2. <details>
<summary>Fork the KwanLab Autometa repository.</summary><summary> You can do this here: https://github.com/KwanLab/Autometa</summary>
<summary>Clone your fork.</summary><code>git clone https://github.com/YourUserName/Autometa.git</code>
<summary>Then navigate to the Autometa directory.</summary><code>cd Autometa</code>
</details>

3. <details>
<summary>Add the KwanLab as the upstream remote.</summary>
<code>git remote add upstream https://github.com/KwanLab/Autometa.git</code>
</details>

4. <details>
<summary>Check out a branch respective to the contribution you plan to make.</summary>
<summary>Check out the <code>hotfix</code> branch from <code>master</code> if fixing a bug.</summary><code>git checkout -b hotfix master</code>
<summary>If adding a feature, check out a branch corresponding to the feature you wish to add from <code>dev</code>.</summary>
<summary> First checkout dev</summary><code>git checkout dev</code>
<summary>Then checkout your feature</summary><code>git checkout -b your-new-feature dev</code>
</details>

5. <details>
<summary>Update your local repository with the most recent updates from the Kwan Lab.</summary>
<summary>Update the <code>master</code> branch if fixing a bug.</summary><code>git pull upstream master</code>
<summary>Otherwise update <code>your-new-feature</code> branch with <code>dev</code> and resolve any merge conflicts.</summary><code>git pull upstream dev</code>
<summary><b>Note: Whenver you return to the feature, make sure to pull from upstream to ensure you are working on the most up-to-date code.</b></summary>
<summary>Update your local repository with any changes from the Kwan Lab.</summary>
<code>git push origin master</code>
<br>
or
<br>
<code>git push origin dev</code>
<br>
<code>git push origin your-new-feature</code>
</details>

6. <details>
<summary>Ensure pre-commit hooks are installed.</summary>
<code>conda install -c conda-forge pre-commit</code>
<br>
<code>pre-commit install</code>
</details>

7. Submit a pull request! To submit a pull request - see [instructions below](#pull-requests).

## How can I contribute?

### Reporting Bugs

> **Note:** If you find a **Closed** issue that seems like it is the same thing
that you're experiencing, open a new issue and include a link to the original
issue in the body of your new one.
> that you're experiencing, open a new issue and include a link to the original
> issue in the body of your new one.

When submitting a bug report, please follow the bug report [template](https://github.com/KwanLab/Autometa/blob/master/.github/ISSUE_TEMPLATE/bug_report.md).


### Suggesting Enhancements

Feature requests may be submitted by creating a new issue. When creating this issue, please follow [this template](https://github.com/KwanLab/Autometa/blob/master/.github/ISSUE_TEMPLATE/feature_request.md). After your feature request has been submitted, a maintainer will respond with a determination of whether this feature is appropriate for Autometa. If a maintainer has not responded within a reasonable time period, you can notify the Autometa team. See [notifying the team](#notifying-the-team) for details.
Expand All @@ -58,9 +92,10 @@ Please follow these steps to have your contribution considered by the maintainer

1. Follow all instructions in respective [bug_fix](https://github.com/KwanLab/Autometa/blob/master/.github/PULL_REQUEST_TEMPLATE/bug_fix.md) or [feature_change](https://github.com/KwanLab/Autometa/blob/master/.github/PULL_REQUEST_TEMPLATE/feature_change.md) templates.
2. Follow the [style guides](#style-guides).
>Note: If writing a new file, a template.py file is provided within the autometa code base to help follow the structure requested by the Autometa team.
Please copy and rename this file before you start writing your feature.
The template file may be found [here](https://github.com/KwanLab/Autometa/blob/dev/docs/template.py), or you may find it within your cloned repository under 'Autometa/docs/template.py'

> Note: If writing a new file, a `template.py` file is provided within the autometa code base to help follow the structure requested by the Autometa team.
> Please copy and rename this file before you start writing your feature.
> The template file may be found [here](https://github.com/KwanLab/Autometa/blob/dev/docs/template.py), or you may find it within your cloned repository under 'Autometa/docs/template.py'

3. After you submit your pull request, verify that all [status checks](https://help.github.com/articles/about-status-checks/) are passing. <details><summary>What if the status checks are failing?</summary>If a status check is failing, and you believe that the failure is unrelated to your change, please leave a comment on the pull request explaining why you believe the failure is unrelated. A maintainer will re-run the status check for you. If we conclude that the failure was a false positive, then we will open an issue to track that problem with our status check suite.</details>

Expand All @@ -70,43 +105,43 @@ While the above must be satisfied, additional prerequisites may be present, depe

### Git Commit Messages

* Use the present tense ("Add feature" not "Added feature")
* Limit the first line to 72 characters or less
* Reference issues and pull requests liberally after the first line
* Consider starting the commit message with an applicable emoji:
* :art: `:art:` when improving the format/structure of the code
* :racehorse: `:racehorse:` when improving performance
* :memo: `:memo:` when writing docs
* :penguin: `:penguin:` when fixing something on Linux
* :apple: `:apple:` when fixing something on macOS
* :bug: `:bug:` when fixing a bug
* :fire: `:fire:` when removing code or files
* :green_heart: `:green_heart:` when fixing the CI build
* :white_check_mark: `:white_check_mark:` when adding tests
* :arrow_up: `:arrow_up:` when upgrading dependencies
* :arrow_down: `:arrow_down:` when downgrading dependencies
* :whale: `:whale:` when fixing the docker build
- Use the present tense ("Add feature" not "Added feature")
- Limit the first line to 72 characters or less
- Reference issues and pull requests liberally after the first line
- Consider starting the commit message with an applicable emoji:
- :art: `:art:` when improving the format/structure of the code
- :racehorse: `:racehorse:` when improving performance
- :memo: `:memo:` when writing docs
- :penguin: `:penguin:` when fixing something on Linux
- :apple: `:apple:` when fixing something on macOS
- :bug: `:bug:` when fixing a bug
- :fire: `:fire:` when removing code or files
- :green_heart: `:green_heart:` when fixing the CI build
- :white_check_mark: `:white_check_mark:` when adding tests
- :arrow_up: `:arrow_up:` when upgrading dependencies
- :arrow_down: `:arrow_down:` when downgrading dependencies

### Documentation Style Guide

Documentation is hosted on reathedocs.org which uses sphinx, a python documentation generator. Therefore a common syntax for
documenting files within the source code is required. The Autometa team follows numpy syntax to automate as much of the documentation build as possible.

* Numpy documentation [style guide](https://numpydoc.readthedocs.io/en/latest/format.html)
* Sphinx restructured text [style guide](http://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#paragraphs)
- Numpy documentation [style guide](https://numpydoc.readthedocs.io/en/latest/format.html)
- Sphinx restructured text [style guide](http://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#paragraphs)

### Python Style Guide

When in doubt, you may reference:

* google's python [style guide](https://github.com/google/styleguide/blob/gh-pages/pyguide.md)
* [PEP8](https://www.python.org/dev/peps/pep-0008/)
We have moved all development to using the [black](black.readthedocs.io) formatter and run
[pre-commit](https://pre-commit.com/) hooks with black such that all of the fuss with formatting according to code
specifications can be ignored! When first cloning the repository, you should first install
pre-commit and run `pre-commit install`. This will ensure any commits you make will be
formatted appropriately.

### Notifying the Team

You may notify the Autometa team corresponding to the respective update/bug by mentioning them in a comment within your issue or pull request.

>Note: Please only use <code>@KwanLab/autometa</code> if you receive no response from any of the other teams below.
> Note: Please only use <code>@KwanLab/autometa</code> if you receive no response from any of the other teams below.

| Team | Area of Development |
| -------------------------------------- | ----------------------------------------- |
Expand Down
21 changes: 15 additions & 6 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,9 @@ your issue, and it is not provided (in a timely manner), your issue may be close

## Environment Information

<details>
<details><summary><code>autometa-configure --dryrun --debug</code></summary><p>

<!-- between the ticks below, please place in any system environment information.
If you are using conda try `conda list -n <your environment>` and paste below. -->
<!-- between the ticks below, paste the output of 'autometa-configure --dryrun --debug' -->

```bash

Expand All @@ -48,9 +47,19 @@ If you are using conda try `conda list -n <your environment>` and paste below. -

## Run Information

<details><summary>contents of <code>run_autometa.log</code></summary><p>
<!-- between the ticks below, paste the information from your run_autometa.log file
'cat </path/to/your/run_autometa.log file>' -->
<details><summary>contents of <code>parameters.config</code></summary><p>
<!-- between the ticks below, paste the information from your input config file
'cat </path/to/your/input/parameters.config>' -->

```bash

```

</p></details>

<details><summary>contents of <code>.nextflow.log</code></summary><p>
<!-- between the ticks below, paste the information from the autometa written config file
within the output directory of the autometa run. 'cat </path/to/your/outdir/metagenome.config>' -->

```bash

Expand Down
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
contact_links:
- name: Join nf-core
url: https://nf-co.re/join
about: Please join the nf-core community here
- name: "Slack #autometa channel"
url: https://nfcore.slack.com/channels/autometa
about: Discussion about the nf-core/autometa pipeline
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
---
name: Feature request
about: Suggest an idea for this project and how it might help the community
title: ''
labels: enhancement
assignees: ''

---

Expand Down
6 changes: 1 addition & 5 deletions .github/ISSUE_TEMPLATE/support_request.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
---
name: Support request
about: Need clarification on a few scripts or the pipeline in general? Ask us!
title: ''
labels: help wanted
assignees: ''

---

<!--
Expand All @@ -17,7 +13,7 @@ Autometa here.
### User checklist

- [ ] Are you using the latest release?
- [ ] Are you using python 2.7?
- [ ] Are you using python 3?
- [ ] Did you check previous issues to see if this has already been mentioned?
- [ ] Are you using a Mac or Linux machine?

Expand Down
26 changes: 26 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!--
# nf-core/autometa pull request

Many thanks for contributing to nf-core/autometa!

Please fill in the appropriate checklist below (delete whatever is not relevant).
These are the most common things requested on pull requests (PRs).

Remember that PRs should be made against the dev branch, unless you're preparing a pipeline release.

Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/autometa/tree/master/.github/CONTRIBUTING.md)
-->
<!-- markdownlint-disable ul-indent -->

## PR checklist

- [ ] This comment contains a description of changes (with reason).
- [ ] If you've fixed a bug or added code that should be tested, add tests!
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/autometa/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/autometa _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] Make sure your code lints (`nf-core lint .`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
- [ ] Output Documentation in `docs/output.md` is updated.
- [ ] `CHANGELOG.md` is updated.
- [ ] `README.md` is updated (including new tool citations and authors/contributors).
2 changes: 0 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE/bug_fix.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
### Requirements for Applying a Bug Fix

<!-- This pull request should be compared against the branch where the bug was encountered. Make sure you are submitting the PR accordingly. -->

* Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
* The pull request must update the test suite to exercise the updated functionality. For guidance, please see [writing tests](https://autometa.readthedocs.io/writing-tests).
* After you create the pull request, all status checks must be passed before a maintainer reviews your contribution. For more details, please see <https://github.com/KwanLab/Autometa/tree/master/.github/CONTRIBUTING.md#pull-requests>.
Expand Down
4 changes: 0 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE/feature_change.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
### Requirements for Adding, Changing, or Removing a Feature

<!-- This pull request should be compared against the `dev` branch as new
features need to be more comprehensively tested before being released into production.
-->

* Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
* The pull request must update the test suite to exercise the updated functionality. For guidance, please see [writing tests](https://autometa.readthedocs.io/writing-tests).
* After you create the pull request, all status checks must be passed before a maintainer reviews your contribution. For more details, please see <https://github.com/KwanLab/Autometa/tree/master/.github/CONTRIBUTING.md#pull-requests>.
Expand Down
Loading