Skip to content

Post Processing Merged BIOMs extended #2698

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 19 commits into from
Nov 1, 2018
Merged

Post Processing Merged BIOMs extended #2698

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
519834b
Post Processing Merged BIOMs extended
Oct 10, 2018
848f30d
Removed two print statements
Oct 29, 2018
9a0e8a9
Move worker.py to new test/support_files subdirectory.
Oct 29, 2018
47c34b7
Child-Process Environment Instantiation generalized
Oct 29, 2018
62922ef
Moved worker.py to new location
Oct 29, 2018
7477c46
Fixes so tests will execute correctly.
Oct 29, 2018
6e604f5
Mods to support needs of updated Deblur plugin
Oct 30, 2018
f2abd23
Working directory for post-processing changed
Oct 30, 2018
1a253b4
flake8
Oct 30, 2018
5bf7ac7
worker.py path adjusted to reflect cwd in Travis
Oct 31, 2018
9d849e9
Resolve spelling error
Oct 31, 2018
c0ba812
fragments renamed to archives
Oct 31, 2018
912ceef
flake8
Oct 31, 2018
4d2880a
Replaced *NIX-specific patch creation w/join()
Oct 31, 2018
6252c98
Merge branch 'dev' into post_processing
charles-cowart Oct 31, 2018
4b1ee2c
Added analysis id to fp_archive.json
Oct 31, 2018
0dd79f9
Merge branch 'post_processing' of https://github.com/charles-cowart/q…
Oct 31, 2018
f61d37a
Modified test to address changes to parameters
Oct 31, 2018
d65103e
Removed unnecessary import
Nov 1, 2018
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
Prev Previous commit
Removed unnecessary import
  • Loading branch information
Charles Cowart authored and Charles Cowart committed Nov 1, 2018
commit d65103ec0503daded97d9364256b6ec07568894b
3 changes: 1 addition & 2 deletions qiita_db/analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
from qiita_core.exceptions import IncompetentQiitaDeveloperError
from qiita_core.qiita_settings import qiita_config
import qiita_db as qdb
from qiita_db.archive import Archive
from json import loads, dump

from subprocess import Popen, PIPE
Expand Down Expand Up @@ -993,7 +992,7 @@ def _build_biom_tables(self,
# archives once, instead of for every cmd.
features = load_table(biom_fp).ids(axis='observation')
features = list(features)
archives = Archive.retrieve_feature_values(
archives = qdb.archive.Archive.retrieve_feature_values(
archive_merging_scheme=archive_merging_scheme,
features=features)

Expand Down