Skip to content

Commit

Permalink
update travis for ecpy channel atom and don't quote python version
Browse files Browse the repository at this point in the history
  • Loading branch information
caryan committed Sep 2, 2016
1 parent 9da85e1 commit c8322c0
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,8 @@

language: python
python:
- "2.7"
- "3.5"
env:
- ATOM=0.3
- ATOM=1.0
matrix:
exclude:
- python: "3.5"
env: ATOM=0.3
- python: "2.7"
env: ATOM=1.0
- 2.7
- 3.5

before_install:
#install git lfs and fetch test data
Expand All @@ -28,7 +19,7 @@ install:

# We do this conditionally because it saves us some downloading if the
# version is the same.
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
- if [[ "$TRAVIS_PYTHON_VERSION" == 2.7 ]]; then
wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
else
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
Expand All @@ -44,8 +35,11 @@ install:
# Create conda environment with dependencies
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy bokeh h5py jupyter scipy networkx future
- source activate test-environment
- if [[ $ATOM == 0.3 ]]; then conda install --yes atom; fi
- if [[ $ATOM == 1.0 ]]; then pip install cppy; pip install git+https://github.com/nucleic/atom.git@1.0.0-dev; fi
- if [[ "$TRAVIS_PYTHON_VERSION" == 2.7 ]]; then
conda install --yes atom;
else
conda install -c ecpy atom;
fi
- pip install watchdog coveralls

script:
Expand Down

0 comments on commit c8322c0

Please sign in to comment.