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

otu_cat_sig_script_fix #1

Open
wants to merge 4,411 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4411 commits
Select commit Hold shift + click to select a range
24b6de4
DOC: finish updating 454 overview tutorial
jairideout Jan 23, 2015
3079bf9
Merge pull request #1890 from charudatta-navare/LEA_seq
jairideout Jan 23, 2015
58ad573
add test for no taxonomy
sowe9385 Jan 23, 2015
e62310e
Merge branch 'master' into differential_abundance
sowe9385 Jan 23, 2015
0a1f8c8
DOC: update parallel QIIME tutorial
jairideout Jan 23, 2015
f4b32fb
Merge pull request #1889 from sowe9385/differential_abundance
jairideout Jan 26, 2015
09b3531
BUG: better error message for missing required headers
jairideout Jan 26, 2015
38ba50c
DOC: fix section underline that was too short
jairideout Jan 26, 2015
c6e2e33
DOC: update "working with biom tables" tutorial
jairideout Jan 26, 2015
073307a
make_2d_plots.py now handles relative proportions explained correctly
ebolyen Jan 26, 2015
fbb26d3
update changelog
ebolyen Jan 26, 2015
4f2d8ba
DOC: update BIOM file format description in QIIME docs
jairideout Jan 27, 2015
1757cec
removed count column from plot_taxa_summary.py
ebolyen Jan 27, 2015
ffb6884
update changelog
ebolyen Jan 27, 2015
72195d2
fixed spelling error, thanks @ElDeveloper
ebolyen Jan 27, 2015
1504e0c
Merge pull request #1901 from jairideout/issue-1874
gregcaporaso Jan 27, 2015
4efb6eb
Merge pull request #1902 from ebolyen/issue-1884
gregcaporaso Jan 27, 2015
59c37f4
DOC: finishing touches to 454 overview tutorial
jairideout Jan 27, 2015
8e2934b
Merge pull request #1895 from jairideout/tutorial-updates-1
gregcaporaso Jan 27, 2015
94b5394
Merge pull request #1898 from jairideout/parallel-qiime-docs
gregcaporaso Jan 27, 2015
cf890e9
DOC: remove unsupported script RST docs
jairideout Jan 27, 2015
861e44a
Merge pull request #1905 from ebolyen/issue-1149
gregcaporaso Jan 28, 2015
4dd5f01
DOC: updated this doc to refer to Software Carpentry, as they provide…
gregcaporaso Jan 28, 2015
f072f6e
REL: added beta note
gregcaporaso Jan 28, 2015
bc39286
DOC: expanded and updated illumina processing notes
gregcaporaso Jan 28, 2015
f661454
DOC: merged extracting barcodes tutorial with the processing illumina…
gregcaporaso Jan 28, 2015
86932ac
DOC: merged jgi tutorial with the processing illumina data tutorial s…
gregcaporaso Jan 28, 2015
00b3c98
DOC: fixed typos
gregcaporaso Jan 28, 2015
a1debb0
DOC: updated and removed text that was specific to an older version o…
gregcaporaso Jan 28, 2015
e054394
DOC: clarified header
gregcaporaso Jan 28, 2015
9a76bd3
DOC: fixes #1032
gregcaporaso Jan 28, 2015
56738a3
MAINT: reduced image size
gregcaporaso Jan 28, 2015
9ea598f
DOC: updated the procrustes tutorial - this was out of sync with the …
gregcaporaso Jan 28, 2015
6fbdf99
DOC: removed bolding
gregcaporaso Jan 28, 2015
a4bf348
DOC: added note on what's installed with pip, fixes #1781
gregcaporaso Jan 28, 2015
8392a3b
Merge pull request #1907 from gregcaporaso/more-issue-1781
jairideout Jan 28, 2015
8aae350
fixed heatmap bug where observations were unnecessarily required
ebolyen Jan 28, 2015
09d35d3
removed comment
ebolyen Jan 28, 2015
16ed4ab
MAINT/REL: changed default confidence threshold fo Naive Bayes classi…
gregcaporaso Jan 29, 2015
d95a205
Merge pull request #1908 from ebolyen/issue-1906
jairideout Jan 29, 2015
3c1345a
Merge branch 'master' into issue-1904
jairideout Jan 29, 2015
0c2d3b0
DOC: update script RST docs
jairideout Jan 29, 2015
cb8cec6
DOC: fix most broken links
jairideout Jan 29, 2015
f993734
TST: fix failing test
gregcaporaso Jan 29, 2015
231f333
DOC: replace QIIME forum links with help.qiime.org
jairideout Jan 29, 2015
b2868ec
DOC: update bmf.colorado.edu links to ftp.microbio.me
jairideout Jan 29, 2015
0ce2dec
MAINT: updated minimum biom version
gregcaporaso Jan 30, 2015
93584bf
Merge pull request #1910 from gregcaporaso/issue-1766
jairideout Jan 30, 2015
8f1ccbe
DOC: install doc updates
jairideout Jan 30, 2015
6dbecbe
Merge pull request #1917 from jairideout/issue-1817
gregcaporaso Jan 30, 2015
3f0cbbb
Merge branch 'master' into issue-1904
jairideout Jan 30, 2015
541df20
DOC: update assign_taxonomy.py script RST
jairideout Jan 30, 2015
bf72fb9
Merge pull request #1913 from jairideout/issue-1904
gregcaporaso Jan 30, 2015
4c02c8e
Merge branch 'master' into biom-update
gregcaporaso Jan 30, 2015
811bef6
TST: fixes #1918
gregcaporaso Jan 30, 2015
2480fc9
REL: updated version strings
gregcaporaso Jan 30, 2015
25c4bd7
REL: update to 1.9.0-dev
gregcaporaso Jan 30, 2015
166dfe6
DOC: updated doc entry point page
gregcaporaso Jan 30, 2015
ffcf052
Merge branch '190-release' into 190-dev
gregcaporaso Jan 30, 2015
b02ff7d
Merge pull request #1920 from gregcaporaso/190-release
jairideout Jan 30, 2015
21ca054
REL: updated classes as pypi was complaining
gregcaporaso Jan 30, 2015
cef9804
Merge pull request #1921 from gregcaporaso/190-dev
gregcaporaso Jan 31, 2015
ebdae67
By default set BIOM table type to "OTU table"
Feb 20, 2015
934614f
Added documentation to collapse_samples.py
wdwvt1 Feb 25, 2015
5cb3c01
DOC: update 0.QIIME_version.txt to use new banner (based on AMI banner)
Feb 26, 2015
a504704
DOC: update remaining virtual box documents
Feb 26, 2015
3e6a496
DOC: update description to reflect newer Ubuntu version
jairideout Feb 27, 2015
8035971
Merge pull request #1943 from jairideout/vb-files-update
gregcaporaso Feb 27, 2015
a389cb7
MAINT: removing docs in favor of wiki page
gregcaporaso Mar 2, 2015
721c8cb
Merge pull request #1945 from gregcaporaso/remove-vb-files
jairideout Mar 2, 2015
f4cda4b
Update of docs and test data
wdwvt1 Mar 8, 2015
2ebbe2a
Merge pull request #1942 from wdwvt1/quick_doc_fix
ElDeveloper Mar 9, 2015
d137b64
Merge branch 'master' into filter_fasta_docs
wdwvt1 Mar 9, 2015
b48c96f
Addressed missing verb
wdwvt1 Mar 9, 2015
4685759
Merge pull request #1949 from wdwvt1/filter_fasta_docs
ElDeveloper Mar 9, 2015
45ef888
Fixed xlim and ylim handling
wdwvt1 Mar 13, 2015
294422b
Merge pull request #1957 from wdwvt1/issue_1956
ElDeveloper Mar 16, 2015
5c6821c
fix fitZIG
sowe9385 Mar 18, 2015
86cb1bf
fix fitZIG
sowe9385 Mar 18, 2015
e695d3e
add fitZIG fix to ChangeLog
sowe9385 Mar 31, 2015
2ff27b6
fix figZIG ChangeLog.md
sowe9385 Mar 31, 2015
52866ea
Merge pull request #1960 from sowe9385/differential_abundance
antgonza Apr 13, 2015
33a198b
BUG: update minimum required versions of two deps
jairideout Apr 15, 2015
ab2189e
TST: relax parallel ChimeraSlayer unit test
jairideout Apr 16, 2015
07db735
Merge pull request #1973 from jairideout/issue-1972
gregcaporaso Apr 16, 2015
7d41301
MAINT: Bump EMPeror's minimum version to 0.9.51
ElDeveloper Apr 22, 2015
994e6a7
MAINT: fixes #1977
gregcaporaso Apr 23, 2015
46804b4
Merge branch 'master' of github.com:qiime/qiime into issue-1977
gregcaporaso Apr 23, 2015
be571d2
REL: updated changelog
gregcaporaso Apr 23, 2015
3c13b5c
BUG: remove formatting of BLAST db, this isn't being used anymore but…
gregcaporaso Apr 28, 2015
2d8bc52
REL: noted fix in changelog
gregcaporaso Apr 28, 2015
07fd432
update version changes and fitZIG bug fix
sowe9385 Apr 28, 2015
bdd4895
Update failing fitZIG test code due to new Bioconductor/R release
sowe9385 Apr 29, 2015
6630a00
Merge branch 'differential_abundance' of https://github.com/sowe9385/…
gregcaporaso Apr 29, 2015
529efb3
Merge branch 'differential_abundance' of https://github.com/sowe9385/…
gregcaporaso Apr 29, 2015
9b003be
TST: tests no longer cover specific output, just that the R code runs…
gregcaporaso Apr 29, 2015
7dfcd73
MAINT: removed code/comments that is no longer necessary
gregcaporaso Apr 29, 2015
f07336a
TST: made tests less specific to avoid issues with underlying R code …
gregcaporaso Apr 29, 2015
80c8378
MAINT: fixed how temp directory is loaded
gregcaporaso Apr 29, 2015
7aea91a
Merge pull request #1990 from gregcaporaso/issue-1989
jairideout Apr 29, 2015
ad5b654
Merge pull request #1985 from ElDeveloper/bump-emperor
gregcaporaso Apr 29, 2015
8db969f
Merge branch 'biom-otu_table-type-fix-v2' of https://github.com/nuada…
gregcaporaso Apr 29, 2015
29d69e3
MAINT/TST: changed parameter name and added test to confirm that resu…
gregcaporaso Apr 29, 2015
1f94fce
REL: added mention
gregcaporaso Apr 29, 2015
6a99541
DOC: added documentation, good catch @ElDeveloper
gregcaporaso Apr 29, 2015
f43e38f
ENH/BUG: fixes #1991 and now detects .fq files as fastq
gregcaporaso Apr 29, 2015
4b5baf9
REL: added mention
gregcaporaso Apr 29, 2015
7042f09
MAINT: fixes #1982
gregcaporaso Apr 29, 2015
82b7f5a
ENH: use tempfile.gettempdir as default temporary directory
jairideout Apr 29, 2015
a0c762d
ENH: updated for IPython 3
gregcaporaso Apr 29, 2015
b83cc3d
ENH: updated for IPy 3
gregcaporaso Apr 29, 2015
d50879a
Merge branch 'master' of github.com:qiime/qiime into issue-1977
gregcaporaso Apr 29, 2015
4dedae2
REL: added note about emperor version update
gregcaporaso Apr 29, 2015
0d00a92
Merge pull request #1986 from gregcaporaso/issue-1977
jairideout Apr 29, 2015
23ec94c
MAINT: updated for IPy 3
gregcaporaso Apr 29, 2015
2965aa1
BUG: enforce explicit range of [0, 1] in pick_otus.py --similarity
jairideout Apr 29, 2015
5093e96
Merge branch 'master' into 1.9.1-quick-fixes
jairideout Apr 29, 2015
77369c2
Merge branch 'master' of github.com:qiime/qiime into biom-otu_table-t…
gregcaporaso Apr 30, 2015
4f5b6fb
MAINT: moved some text around
gregcaporaso Apr 30, 2015
bb08a70
Merge pull request #1996 from gregcaporaso/biom-otu_table-type-fix-v2
jairideout Apr 30, 2015
5d7b9ea
MAINT: fixed bad logic in version requirement
gregcaporaso Apr 30, 2015
2a197ef
Merge branch 'master' of github.com:qiime/qiime into quick-fixes
gregcaporaso Apr 30, 2015
cd056ee
MAINT: cleared output
gregcaporaso Apr 30, 2015
ce6e58c
REL: added note to changelog
gregcaporaso Apr 30, 2015
8291b0a
Merge branch 'master' into 1.9.1-quick-fixes
jairideout Apr 30, 2015
0f042c6
Merge pull request #1999 from jairideout/1.9.1-quick-fixes
gregcaporaso Apr 30, 2015
68e743d
Merge branch 'master' of github.com:qiime/qiime into quick-fixes
gregcaporaso Apr 30, 2015
9f493d2
Merge pull request #1998 from gregcaporaso/quick-fixes
jairideout Apr 30, 2015
f31906f
BUG: disallow -p 0, fixes #1984
gregcaporaso May 1, 2015
6ccc3a1
REL: added note on #1984 fix
gregcaporaso May 1, 2015
eada6f7
DOC: added note on required python version, thanks @RobMoser, fixes #…
gregcaporaso May 1, 2015
fe9cb8b
ENH: fixes #1963
gregcaporaso May 1, 2015
91736e3
DOC: improved documentation of --barcode_type not-barcoded, fixes #1940
gregcaporaso May 1, 2015
e25f82f
DOC: fixes #1934
gregcaporaso May 1, 2015
2cd4b81
DOC: fixes #1966
gregcaporaso May 1, 2015
857d085
DOC: addressed comment from @ElDeveloper
gregcaporaso May 1, 2015
5b267a6
Merge pull request #2001 from gregcaporaso/more-quick-fixes
jairideout May 1, 2015
4ac94e1
Fixes issue #2009
wdwvt1 May 15, 2015
b1c4315
Update example in summarize_taxa.py
colinbrislawn May 19, 2015
22db302
Add slurm time feature to start_parallel_jobs_slurm
mkgilbert May 20, 2015
b4e5856
Fix shebang line and time.opts conditional check
mkgilbert May 21, 2015
4b9235c
REL/MAINT/DOC
gregcaporaso May 21, 2015
3fb60d8
MAINT
gregcaporaso May 21, 2015
cd4a61d
DOC: added note on new setting
gregcaporaso May 21, 2015
68075b8
Merge pull request #2021 from gregcaporaso/slurm-time-feature
jairideout May 21, 2015
0902f60
Merge pull request #2016 from colinbrislawn/patch-1
gregcaporaso May 21, 2015
88c40c7
fix #2007
antgonza May 21, 2015
a420f59
MAINT: fixes #2004
gregcaporaso May 22, 2015
1d933ee
MAINT: fixes #1935
gregcaporaso May 22, 2015
dff9927
MAINT: fixes #2000
gregcaporaso May 22, 2015
4ddf91c
MAINT: remove unused qiime.beta_diversity.single_object_beta function
jairideout May 22, 2015
7dfe532
MAINT: remove unused qiime.beta_diversity.BetaDiversityCalc class
jairideout May 22, 2015
e4b8f86
MAINT: added explicit version requirement for cogent as it's not spec…
gregcaporaso May 22, 2015
f02982e
Merge pull request #2023 from antgonza/fix-2007
gregcaporaso May 22, 2015
5e2f084
MAINT: removed overly restrictive test, fixes #2003
gregcaporaso May 22, 2015
a688c10
REL
gregcaporaso May 22, 2015
d6a91c5
Merge pull request #2026 from gregcaporaso/issue-2003
jairideout May 22, 2015
454d438
Merge branch 'issue_2009' of github.com:wdwvt1/qiime into issue_2009
gregcaporaso May 22, 2015
ac035f3
MAINT: addressed @ElDeveloper's comment
gregcaporaso May 22, 2015
1db053f
REL: added description of fix
gregcaporaso May 22, 2015
03a32b6
Merge branch 'i2k' into issue_2009
gregcaporaso May 22, 2015
b2a8759
REL: emphasizing important bugs
gregcaporaso May 22, 2015
fe29687
HACK: add convert_matching_names_to_zero to qiime.format.format_matrix
jairideout May 22, 2015
9e58fc8
Merge branch 'issue_2009' of github.com:gregcaporaso/qiime into issue…
jairideout May 22, 2015
2c21109
DOC: add changelog message
jairideout May 22, 2015
0daba17
Merge pull request #2025 from gregcaporaso/i2k
jairideout May 22, 2015
6f2b3f6
MAINT: fixes #2024
gregcaporaso May 22, 2015
7bc1302
Merge branch 'master' of github.com:qiime/qiime into issue-2024
gregcaporaso May 22, 2015
6011ba3
DOC: add note to normalize_table.py about taxonomy metadata
jairideout May 22, 2015
4ee1113
REL/DOC: updated overview tutorial discussion
gregcaporaso May 22, 2015
33534d8
Merge branch 'issue-1933' of https://github.com/jairideout/qiime into…
gregcaporaso May 22, 2015
45ea5cd
Merge pull request #2030 from jairideout/issue-1929
gregcaporaso May 22, 2015
d692d51
Merge branch 'master' of github.com:qiime/qiime into issue-2024
gregcaporaso May 22, 2015
f4b3463
REL: updated version for 1.9.1 release
gregcaporaso May 22, 2015
f0c598b
MAINT: fixed some broken links in the docs
gregcaporaso May 22, 2015
8c5a051
Merge pull request #2028 from jairideout/issue-1933
gregcaporaso May 22, 2015
d60e98f
Merge branch 'master' of github.com:qiime/qiime into 191-release
gregcaporaso May 22, 2015
fc5ef46
MAINT: fixed typo
gregcaporaso May 22, 2015
8cc5db8
REL: updated for 1.9.1-dev
gregcaporaso May 22, 2015
269b5e1
REL: further clarified which bug fixes are critical
gregcaporaso May 22, 2015
bb64d18
Merge branch '191-release' into 191-dev
gregcaporaso May 22, 2015
85ceed2
MAINT: set upper bound on natsort version
gregcaporaso May 26, 2015
fd59c20
Merge pull request #2031 from gregcaporaso/191-release
jairideout May 26, 2015
0931a10
MAINT: pypi-related fix
gregcaporaso May 26, 2015
b8ab6cd
Merge branch 'master' of github.com:qiime/qiime into 191-dev
gregcaporaso May 26, 2015
94ee2f5
MAINT: fixed outdated references
gregcaporaso May 26, 2015
a9116f6
Merge pull request #2032 from gregcaporaso/191-dev
jairideout Jun 1, 2015
1492858
DOC:Oudated flags for print_qiime_config.py in doc
ElDeveloper Jun 3, 2015
782f430
DOC: Update flag for biom convert and more docs
ElDeveloper Jun 3, 2015
4a988fc
Merge pull request #2039 from ElDeveloper/st-docs
gregcaporaso Jun 4, 2015
4e296b1
DOC: Fix random forest installation command
ElDeveloper Jun 9, 2015
24bc32d
DOC: fix uclust max_accepts typo in changelog
jairideout Jun 12, 2015
24ef510
Merge pull request #2046 from jairideout/uclust-max-accepts-changelog…
gregcaporaso Jun 15, 2015
39f39c2
Update split_libraries.py
aubreybailey Jun 23, 2015
7169479
Merge pull request #2051 from aubreybailey/patch-2
ElDeveloper Aug 27, 2015
e708e61
BUG: Add --read_arguments_from_file to sl_fastq.py
ElDeveloper Aug 28, 2015
0c3482b
ENH: The list files are saved in the output dir
ElDeveloper Aug 28, 2015
2f44b79
ENH: Add a test for directory checking
ElDeveloper Aug 28, 2015
5c52ab7
ENH/DOC: Improve docs and pieces of code
ElDeveloper Aug 29, 2015
c2b62a8
Merge pull request #2077 from ElDeveloper/issue-2069
antgonza Sep 2, 2015
f9b7f71
Modified multiple_split_libraries_fastq.py to filter target files, wi…
Oct 5, 2015
dfcebc3
fix bug in parameter
gregcaporaso Oct 14, 2015
1858a08
Update ChangeLog.md
gregcaporaso Oct 14, 2015
c06530c
Merge pull request #2091 from biocore/slurm-fix
jairideout Oct 14, 2015
3c23a00
fixes #2102
gregcaporaso Nov 5, 2015
93a152b
Improve error message in parse.py. Closes #2113
colinbrislawn Dec 3, 2015
f9b4da6
BUG: Change taxa in compute_taxonomy_ratios.py
ElDeveloper Dec 8, 2015
38e8a11
Fix link to newick format, closes #2122
colinbrislawn Feb 2, 2016
036cbac
Merge pull request #2128 from colinbrislawn/patch-2
ebolyen Feb 2, 2016
8b42f93
MNT: remove pylab use + linting
tacaswell Apr 26, 2016
66f5958
MNT: use pyplot instead of pylab for imports
tacaswell Apr 26, 2016
f8b74e7
FIX: simplify make_legend
tacaswell Apr 28, 2016
4a74c4f
FIX: invalid syntax
tacaswell Apr 28, 2016
2678cb9
HACK: seems to be using global state for plotting
tacaswell Apr 28, 2016
3babfa1
DOC: updates to point new devs toward QIIME 2
gregcaporaso Apr 29, 2016
7bcd373
Merge pull request #2144 from gregcaporaso/contributing-updates
jairideout Apr 29, 2016
78cd4eb
Merge pull request #2143 from tacaswell/mnt_remove_pylab
gregcaporaso Apr 29, 2016
8f10a19
Merge pull request #2115 from ElDeveloper/different-taxa
gregcaporaso Apr 29, 2016
d898269
TST: fix failing bootstrapped p-value test
jairideout Apr 29, 2016
3f0b8c6
MAINT: cap third-party dependencies
jairideout Apr 29, 2016
e8ca445
MAINT: cap matplotlib at 1.4.3
jairideout Apr 29, 2016
5a035a6
Merge pull request #2145 from jairideout/dep-version-cap
gregcaporaso May 2, 2016
55b7530
Merge pull request #2114 from colinbrislawn/patch-1
gregcaporaso May 3, 2016
9ec01cc
Merge pull request #2044 from ElDeveloper/sl-docs
gregcaporaso May 3, 2016
03a60d1
Modified usage scripts to fix script test failures, added text for cl…
May 3, 2016
b5ed5c4
Merge pull request #2088 from walterst/msl_Oct52015_1971
gregcaporaso May 3, 2016
c8244bc
fixed cerstain to certain
gblanchard4 May 11, 2016
a47110b
fixed silenty to silently
gblanchard4 May 11, 2016
11b09ba
fixed REPSONSIBILTY to RESPONSIBILITY
gblanchard4 May 11, 2016
ed56d27
Updated Bio Stat Handbook link
gblanchard4 May 11, 2016
b5923af
Fixed paramater to parameter
gblanchard4 May 11, 2016
2f90a7d
fixed probablilty to probability
gblanchard4 May 11, 2016
ac09f88
fixed nonparamteric to nonparametric
gblanchard4 May 11, 2016
3201f66
Merge pull request #2148 from gblanchard4/fix-group_significance-docu…
gregcaporaso May 12, 2016
967cf3b
improve doc for filter_fasta (--valid_states)
May 25, 2016
1fe8983
New installation instructions using Conda
cuttlefishh Jul 20, 2016
d38aec7
changed wget to curl -sO
cuttlefishh Jul 22, 2016
591ea08
Merge pull request #2162 from cuttlefishh/luke-qiime
gregcaporaso Jul 22, 2016
c638e53
Revert "New installation instructions using Conda"
gregcaporaso Jul 22, 2016
01c951b
Merge pull request #2165 from biocore/revert-2162-luke-qiime
gregcaporaso Jul 22, 2016
4948254
DOC: updates install instructions to use conda
gregcaporaso Jul 22, 2016
24004fb
Merge pull request #2166 from gregcaporaso/conda-install
gregcaporaso Jul 22, 2016
bbec755
Update join_paired_ends.py
shiffer1 Jul 27, 2016
9a1d17c
Merge pull request #2167 from shiffer1/patch-1
gregcaporaso Jul 29, 2016
c381815
updates to install doc for clarity
gregcaporaso Aug 10, 2016
6d8ffca
Merge pull request #2151 from iugrina/doc_fix
gregcaporaso Aug 16, 2016
4de878e
Update README.md
gregcaporaso Jul 10, 2017
3d3dcf5
DOC/BUG: fix broken BLAST download links
jairideout Jul 11, 2017
787ead3
Merge pull request #2196 from jairideout/blast-url-fix
gregcaporaso Jul 11, 2017
76d633c
Update README.md
gregcaporaso Jan 3, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.gitignore export-ignore
.gitattributes export-ignore
27 changes: 27 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ var
sdist
develop-eggs
.installed.cfg
MANIFEST

# Installer logs
pip-log.txt
Expand All @@ -28,3 +29,29 @@ pip-log.txt

# vi
.*.swp

#OS X files
.DS_Store

.metadata
build

# compiled denoiser files
qiime/support_files/denoiser/FlowgramAlignment/ADPCombinators.hi
qiime/support_files/denoiser/FlowgramAlignment/ADPCombinators.o
qiime/support_files/denoiser/FlowgramAlignment/FlowgramAli_4frame
qiime/support_files/denoiser/FlowgramAlignment/FlowgramAli_4frame.hi
qiime/support_files/denoiser/FlowgramAlignment/FlowgramAli_4frame.o
qiime/support_files/denoiser/FlowgramAlignment/FlowgramUtils.hi
qiime/support_files/denoiser/FlowgramAlignment/FlowgramUtils.o
scripts/FlowgramAli_4frame

# scripts that can be present after pip install -e .
scripts/FastTree
scripts/uclust
scripts/indexdb_rna
scripts/sortmerna
scripts/sumaclust
scripts/swarm
scripts/amplicon_contingency_table.py
scripts/swarm_breaker.py
19 changes: 19 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# should fix duplicated/non-matching names after the migration from svn/SF
Adam Robbins-Pianka <[email protected]> Adam Robbins-Pianka <[email protected]>
Antonio Gonzalez <[email protected]> Antonio Gonzalez <[email protected]>
Antonio Gonzalez <[email protected]> antgonza <[email protected]>
Catherine Lozupone <[email protected]> Cathy Lozupone <[email protected]>
Dan Knights <[email protected]> Dan Knights <[email protected]>
Dan Knights <[email protected]> danknights <[email protected]>
Daniel McDonald <[email protected]> Daniel McDonald <[email protected]>
David Soergel <[email protected]> David Soergel <[email protected]>
Jose Carlos Clemente <[email protected]> Jose Carlos Clemente Litran <[email protected]>
Jose Navas <[email protected]> jose <jose@jose-K53SJ.(none)>
Justin Kuczynski <[email protected]> justin <[email protected]>
Luke Ursell <[email protected]> Luke Ursell <[email protected]>
Luke Ursell <[email protected]> Luke Ursell <[email protected]>
Tony Walters <[email protected]> walterst <[email protected]>
Will Van Treuren <[email protected]> William Van Treuren <[email protected]>
Will Van Treuren <[email protected]> wdwvt1 <[email protected]>
Will Van Treuren <[email protected]> Will Van Treuren <[email protected]>
Yoshiki Vázquez Baeza <[email protected]> Yoshiki <[email protected]>
115 changes: 115 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
Contributing to QIIME
=====================

**QIIME 1 is now considered to be in maintenance mode as we shift our development efforts to [QIIME 2](http://github.com/qiime2). We don't expect to release any new versions of QIIME 1, except for critical bug fixes if necessary. If you're interested in contributing to QIIME, please consider [contributing to QIIME 2](https://github.com/qiime2/qiime2/blob/master/CONTRIBUTING.md).**

[QIIME](http://www.qiime.org) is an open source software package, and we welcome community contributions. You can find the source code and test code for QIIME under public revision control in the QIIME git repository on [GitHub](https://github.com/qiime/qiime). While we have a core development group, we very much welcome contributions from other users.

This document covers what you should do to get started with contributing to QIIME. You should read this whole document before considering submitting code to QIIME. This will save time for both you and the QIIME developers.

To get help with using QIIME, please visit http://help.qiime.org.

Type of Submissions
-------------------

Some of the types of contributions we're interested in are new features (big or small, but for big ones it's generally a good idea to ask us if we're interested in including it before starting development), bug fixes, and documentation updates, additions, and fixes.

When considering submitting a new feature to QIIME, you should begin by posting an issue to the [QIIME issue tracker](https://github.com/qiime/qiime/issues). The information that you include in that post will differ based on the type of contribution. Your contribution will also need to be fully tested (discussed further below).

* For new features, you'll want to describe why the functionality that you are proposing to add is relevant. For it to be relevant, it should be demonstrably useful to QIIME users. This typically means that a new analytic method is implemented (you should describe why it's useful, ideally including a link to a paper that uses this method), or an existing method is enhanced (your implementation matches the performance of the pre-existing method while reducing runtime, memory consumption, etc, or it improves performance over the pre-existing method). We will request benchmark results comparing your method to the pre-existing methods (which would also be required for publication of your method) so pointing to a paper or other document containing benchmark results, or including benchmark results in your issue, will speed up the process.

* For bug fixes, you should provide a detailed description of the bug so other developers can reproduce it. We take bugs in QIIME very seriously. Bugs can be related to errors in code, documentation, or tests. Errors in documentation or tests are usually updated in the next major release of QIIME. Errors in code that could result in incorrect results or inability to access certain functionality may result in a new minor release of QIIME.

You should include the following information in your bug report:

1. The exact command or function call that you issue to create the bug.
2. A link to all necessary input files for reproducing the bug. These files should only be as large as necessary to create the bug. For example, if you have an input file with 10,000 fasta-formatted sequences but the error only arises due to one of the sequences, create a new fasta file with only that sequence, run the command that was giving you problems, and verify that you still get an error. Then post that command and link to the trimmed fasta file. This is *extremely* useful to other developers, and it is likely that if you don't provide this information you'll get a response asking for it. Often this process helps you to better understand the bug as well.

* For documentation additions, you should first post an issue describing what you propose to add, where you'd like to add it in the documentation, and a description of why you think it's an important addition. For documentation improvements and fixes, you should post an issue describing what is currently wrong or missing, and how you propose to address it.

When you post your issue, the QIIME developers will respond to let you know if we agree with the addition or change. It's very important that you go through this step to avoid wasting time working on a feature that we are not interested in including in QIIME.


Getting started: "quick fixes"
------------------------------

Some of our issues are labeled as ``quick fix``. Working on [these issues](https://github.com/qiime/qiime/issues?direction=desc&labels=quick+fix&milestone=&page=1&sort=updated&state=open) is a good way to get started with contributing to QIIME. These are usually small bugs or documentation errors that will only require one or a few lines of code to fix. Getting started by working on one of these issues will allow you to familiarize yourself with our development process before committing to a large amount of work (e.g., adding a new feature to QIIME). If you're interested in working on one of these issues, you should comment on the issue requesting that it be assigned to you.


Code Review
-----------

When you submit code to QIIME, it will be reviewed by one or more QIIME developers. These reviews are intended to confirm a few points:

* Your code is sufficiently well-tested (see Testing Guidelines below).
* Your code adheres to our Coding Guidelines (see Coding Guidelines below).
* Your code is sufficiently well-documented (see Coding Guidelines below).
* Your code provides relevant changes or additions to QIIME (Type of Submissions above).

This process is designed to ensure the quality of QIIME, and can be a very useful experience for new developers.

Particularly for big changes, if you'd like feedback on your code in the form of a code review as you work, you should request help in the issue that you created and one of the QIIME developers will work with you to perform regular code reviews. This can greatly reduce development time (and frustration) so we highly recommend that new developers take advantage of this rather than submitting a pull request with a massive amount of code in one chunk. That can lead to frustration when the developer thinks they are done, but the reviewer requests large amounts of changes, and it is also very hard to review.


Submitting code to QIIME
------------------------

QIIME is hosted on [GitHub](http://www.github.com), and we use GitHub's [Pull Request](https://help.github.com/articles/using-pull-requests) mechanism for accepting submissions. You should go through the following steps to submit code to QIIME.

1. Begin by [creating an issue](https://github.com/qiime/qiime/issues) describing your proposed change. This should include a description of your proposed change (is it a new feature, a bug fix, etc.), and note in the issue description that you want to work on it. If you'll be modifying existing QIIME file(s), you'll want to get input from the developer responsible for the relevant file(s) via a discussion on the issue tracker to let them know you what you'd like to do. The developer responsible for the code is named in the ``__maintainer__`` variable at the top of the file. Once you hear back that it is OK to make changes (i.e., they don't have local edits, they agree with the change you'd like to make, and they're comfortable with you editing their code), we will assign the issue to you on GitHub.

2. [Fork](https://help.github.com/articles/fork-a-repo) the QIIME repository on the GitHub website to your GitHub account.

3. Clone your forked repository to the system where you'll be developing with ``git clone``.

4. Ensure that you have the latest version of all files (especially important if you cloned a long time ago, but you'll need to do this before submitting changes regardless). You should do this by adding QIIME as a remote repository and then pulling from that repository. You'll only need to run the ``git remote`` step one time:
```
git checkout master
git remote add upstream https://github.com/qiime/qiime.git
git pull upstream master
```

5. Create a new topic branch that you will make your changes in with ``git checkout -b``:
```
git checkout -b my-topic-branch
```

6. Run ``qiime/tests/all_tests.py`` to confirm that the tests pass before you make any changes. You may get some failures, for example if you don't have an external application (e.g., RDP Classifier) installed. It is acceptable to continue if the failing tests are unrelated to the the code your working with. However, if you want to make changes to ``assign_taxonomy.py`` and ``test_assign_taxonomy.py`` is failing because of missing external applications, you should not proceed until you have installed the external applications and all tests pass.

7. Make your changes, add them (with ``git add``), and commit them (with ``git commit``). Don't forget to update associated scripts and tests as necessary. You should make incremental commits, rather than one massive commit at the end. Write descriptive commit messages to accompany each commit.

8. When you think you're ready to submit your code, again ensure that you have the latest version of all files in case some changed while you were working on your edits. You can do this by merging master into your topic branch:
```
git checkout my-topic-branch
git pull upstream master
```

9. Run ``qiime/tests/all_tests.py`` to ensure that your changes did not cause anything unexpected to break. Note that some tests may fail again because you do not have external applications installed. This is why it is important that you run ``all_tests.py`` prior to making changes: if the same tests fail, then you should be OK.

10. Once the tests pass, you should push your changes to your forked repository on GitHub using:
```
git push origin my-topic-branch
```

11. Issue a [pull request](https://help.github.com/articles/using-pull-requests) on the GitHub website to request that we merge your branch's changes into QIIME's master branch. One of the QIIME developers will review your code at this stage. If we request changes (which is very common), *don't issue a new pull request*. You should make changes on your topic branch, and commit and push them to GitHub. Your pull request will update automatically.

Coding Guidelines
-----------------

We adhere to the [PEP 8](http://www.python.org/dev/peps/pep-0008/) python coding guidelines for code and documentation standards. Before submitting any code to QIIME, you should read these carefully and apply the guidelines in your code.

On reviewing QIIME, you will notice that all of our code isn't up to PEP 8 standards. This is something that we're striving toward, and as such all new contributions must adhere.


Testing Guidelines
------------------

All code that is added to QIIME must be unit tested, and the unit test code must be submitted in the same pull request as the library code that you are submitting. We will not merge code that is not unit tested. The PyCogent Coding Guidelines describe our [expectations for unit tests](http://pycogent.org/coding_guidelines.html?highlight=coding%20guidelines#how-should-i-test-my-code). You should review the unit test section before working on your test code.

Because (at this time) our user interface is entirely command-line-based, we have developed a script interface testing framework to ensure that future changes to scripts don't break the command line interface. If you are developing or extending a QIIME script, you should review the [PyCogent script guidelines](http://pycogent.org/scripting_guidelines.html) and the [script interface testing documentation](http://qiime.org/developer/script_testing.html).


Getting help with git
=====================

If you're new to ``git``, you'll probably find [gitref.org](http://gitref.org/) helpful.
Loading