Skip to content

Commit 0db78d7

Browse files
committed
rm conda update --yes conda
1 parent 9cda47e commit 0db78d7

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: python
33
sudo: false
44
env:
55
global:
6-
- PYTHON_VERSION=3.5
6+
- PYTHON_VERSION=2.7
77
matrix:
88
- TEST_ADD_STUDIES=False COVER_PACKAGE=qiita_db
99
- TEST_ADD_STUDIES=False COVER_PACKAGE=qiita_pet
@@ -15,8 +15,6 @@ before_install:
1515
- chmod +x miniconda.sh
1616
- ./miniconda.sh -b
1717
- export PATH=/home/travis/miniconda3/bin:$PATH
18-
# Update conda itself
19-
- conda update --yes conda
2018
# Downloading and setting up ascp for EBI testing
2119
- 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
2220
- chmod +x ascp-install-3.5.4.102989-linux-64-qiita.sh
@@ -27,7 +25,7 @@ before_install:
2725
install:
2826
# install a few of the dependencies that pip would otherwise try to install
2927
# when intalling scikit-bio
30-
- travis_retry conda create -q --yes -n qiita python=2.7 pip nose flake8
28+
- travis_retry conda create -q --yes -n qiita python=$PYTHON_VERSION pip nose flake8
3129
pyzmq 'networkx<2.0' pyparsing natsort mock future libgfortran seaborn nltk
3230
'pandas>=0.18' 'matplotlib>=1.1.0' 'scipy>0.13.0' 'numpy>=1.7' 'h5py>=2.3.1'
3331
- source activate qiita
@@ -56,7 +54,7 @@ install:
5654
- cp $PWD/qiita_core/support_files/BIOM\ type_2.1.4.conf ~/.qiita_plugins/BIOM\ type_2.1.4\ -\ Qiime2.conf
5755
- touch ~/.bash_profile
5856
# Install the biom plugin so we can run the analysis tests
59-
- travis_retry conda create -q --yes -n qtp-biom python=$PYTHON_VERSION --file https://data.qiime2.org/distro/core/qiime2-2017.12-conda-linux-64.txt
57+
- 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
6058
- source activate qtp-biom
6159
- pip install https://github.com/qiita-spots/qiita_client/archive/master.zip
6260
- pip install https://github.com/qiita-spots/qtp-biom/archive/master.zip --process-dependency-links

0 commit comments

Comments
 (0)