Skip to content

Fix branch #2176

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 20 commits into from
Jul 20, 2017
Merged

Fix branch #2176

Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4ed4ead
improving analysis listing
antgonza Jul 17, 2017
c372336
addressing @ElDeveloper comments
antgonza Jul 18, 2017
f6c9347
adding list artifacts
antgonza Jul 18, 2017
6e1da46
fix conflictgs
antgonza Jul 18, 2017
0488cc5
changing names
antgonza Jul 18, 2017
f60c0ef
fixing . -> ,
antgonza Jul 18, 2017
0044678
only_biom
antgonza Jul 18, 2017
81d9d37
actually using only_biom
antgonza Jul 18, 2017
e3cf4cf
sleep
antgonza Jul 19, 2017
95e6d91
moving sleep
antgonza Jul 19, 2017
b38b3ea
import sleep
antgonza Jul 19, 2017
a63a031
sleep(0.8)
antgonza Jul 19, 2017
75836bc
sleep(1)
antgonza Jul 19, 2017
e2915de
addressing @ElDeveloper comments
antgonza Jul 19, 2017
957b9b2
flake8
antgonza Jul 19, 2017
b13ac98
is_qiita_job
antgonza Jul 19, 2017
afe13b6
job_info -> ji
antgonza Jul 19, 2017
aac47c8
addressing @ElDeveloper comments
antgonza Jul 20, 2017
0d68066
fixing branch
antgonza Jul 20, 2017
4628033
upstream
antgonza Jul 20, 2017
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
10 changes: 6 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ before_install:
- chmod +x ascp-install-3.5.4.102989-linux-64-qiita.sh
- ./ascp-install-3.5.4.102989-linux-64-qiita.sh
# once we have ebi testing we should uncomment this line
# look for EBI below as it's part of this
# - if [ ${TRAVIS_PULL_REQUEST} == "false" ]; then openssl aes-256-cbc -K $encrypted_a2e23aea5f14_key -iv $encrypted_a2e23aea5f14_iv -in qiita_core/support_files/config_test_travis.cfg.enc -out qiita_core/support_files/config_test_travis.cfg -d ; fi
install:
# install a few of the dependencies that pip would otherwise try to install
Expand All @@ -43,10 +44,11 @@ before_script:
# Some of the tests rely on the plugin system to complete successfuly.
# Thus, we need a qiita webserver running to be able to execute the tests.
- export MOI_CONFIG_FP=`pwd`/qiita_core/support_files/config_test.cfg
- if [ ${TRAVIS_PULL_REQUEST} == "false" ]; then
export QIITA_CONFIG_FP=`pwd`/qiita_core/support_files/config_test_travis.cfg;
export MOI_CONFIG_FP=`pwd`/qiita_core/support_files/config_test_travis.cfg;
fi
# EBI, see the end of before_install about why this block is commented out
# - if [ ${TRAVIS_PULL_REQUEST} == "false" ]; then
# export QIITA_CONFIG_FP=`pwd`/qiita_core/support_files/config_test_travis.cfg;
# export MOI_CONFIG_FP=`pwd`/qiita_core/support_files/config_test_travis.cfg;
# fi
- ipython profile create qiita-general --parallel
- qiita-env start_cluster qiita-general
- qiita-env make --no-load-ontologies
Expand Down