Skip to content

fix master #2453

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 7 commits into from
Jan 8, 2018
Merged

fix master #2453

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e060fc
fix master
antgonza Jan 4, 2018
8571fd0
data.qiime2 -> raw.githubusercontent
antgonza Jan 4, 2018
7ac2994
try Miniconda3-4.3.31
antgonza Jan 4, 2018
667e751
minimizing changes
antgonza Jan 8, 2018
ddc2595
qiime2-2017.11 -> qiime2-2017.12
antgonza Jan 8, 2018
9cda47e
PYTHON_VERSION=3.5
antgonza Jan 8, 2018
0db78d7
rm conda update --yes conda
antgonza Jan 8, 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
6 changes: 2 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@ env:
before_install:
- redis-server --version
- redis-server --port 7777 &
- wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- wget http://repo.continuum.io/miniconda/Miniconda3-4.3.31-Linux-x86_64.sh -O miniconda.sh
- chmod +x miniconda.sh
- ./miniconda.sh -b
- export PATH=/home/travis/miniconda3/bin:$PATH
# Update conda itself
- conda update --yes conda
# Downloading and setting up ascp for EBI testing
- wget ftp://ftp.microbio.me/pub/qiita/ascp-install-3.5.4.102989-linux-64-qiita.sh -O ascp-install-3.5.4.102989-linux-64-qiita.sh
- chmod +x ascp-install-3.5.4.102989-linux-64-qiita.sh
Expand Down Expand Up @@ -56,7 +54,7 @@ install:
- cp $PWD/qiita_core/support_files/BIOM\ type_2.1.4.conf ~/.qiita_plugins/BIOM\ type_2.1.4\ -\ Qiime2.conf
- touch ~/.bash_profile
# Install the biom plugin so we can run the analysis tests
- travis_retry conda create -q --yes -n qtp-biom --file https://data.qiime2.org/distro/core/qiime2-2017.11-conda-linux-64.txt
- travis_retry conda create -q --yes -n qtp-biom python=3.5 --file https://data.qiime2.org/distro/core/qiime2-2017.12-conda-linux-64.txt
- source activate qtp-biom
- pip install https://github.com/qiita-spots/qiita_client/archive/master.zip
- pip install https://github.com/qiita-spots/qtp-biom/archive/master.zip --process-dependency-links
Expand Down