Skip to content

fix alpha rarefaction naming #123

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 19, 2014
Merged

fix alpha rarefaction naming #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51f3507
fix alpha rarefaction naming
squirrelo Jun 19, 2014
7530837
Alpha Diversity -> Alpha Rarefaction
squirrelo Jun 19, 2014
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
2 changes: 1 addition & 1 deletion qiita_db/support_files/initialize.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ INSERT INTO qiita.filepath_type (filepath_type) VALUES ('raw_sequences'), ('raw_
INSERT INTO qiita.checksum_algorithm (name) VALUES ('crc32');

-- Populate commands available
INSERT INTO qiita.command (name, command) VALUES ('Summarize Taxa', 'summarize_taxa_through_plots.py'), ('Beta Diversity', 'beta_diversity_through_plots.py'), ('Alpha Diversity', 'alpha_rarefaction_through_plots.py');
INSERT INTO qiita.command (name, command) VALUES ('Summarize Taxa', 'summarize_taxa_through_plots.py'), ('Beta Diversity', 'beta_diversity_through_plots.py'), ('Alpha Rarefaction', 'alpha_rarefaction.py');
2 changes: 1 addition & 1 deletion qiita_db/test/test_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def test_exists_not_there(self):
def test_create(self):
"""Makes sure creation works as expected"""
# make first job
new = Job.create("18S", "Alpha Diversity",
new = Job.create("18S", "Alpha Rarefaction",
self.options, Analysis(1))
self.assertEqual(new.id, 4)
# make sure job inserted correctly
Expand Down
4 changes: 2 additions & 2 deletions qiita_pet/handlers/analysis_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ def post(self):
data_types = sorted(list(data_types))

# FIXME: Pull out from the database, see #111
commands = {'16S': ['Alpha Diversity', 'Beta Diversity',
commands = {'16S': ['Alpha Rarefaction', 'Beta Diversity',
'Summarize Taxa'],
'18S': ['Alpha Diversity', 'Beta Diversity',
'18S': ['Alpha Rarefaction', 'Beta Diversity',
'Summarize Taxa'],
'Metabolomic': ['Summarize Taxa']}

Expand Down