Skip to content

Commit

Permalink
Merge pull request #68 from dopplershift/travis
Browse files Browse the repository at this point in the history
More Travis
  • Loading branch information
lesserwhirls committed Nov 22, 2015
2 parents 4cdef05 + 8daaa7e commit 5386fad
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ env:
global:
- WHEELHOUSE="https://unidata-python.s3.amazonaws.com/wheelhouse/index.html"
- WHEELDIR="wheelhouse/"
- EXTRAS="test"
matrix:
- NOSE_WITH_COVERAGE=y NOSE_COVER_PACKAGE=siphon
- TASK="examples"
Expand Down Expand Up @@ -54,23 +55,23 @@ before_install:
pip install --upgrade pip;
if [[ $TASK == "docs" || $TASK == "examples" ]]; then
if [[ $TASK == "examples" ]]; then
export VERSIONS="$VERSIONS -r examples/requirements.txt";
export EXTRAS="$EXTRAS,examples";
fi;
pip install -r docs/requirements.txt;
fi;
if [[ $NOSE_WITH_COVERAGE == y ]]; then
pip install coverage;
fi;
mkdir $WHEELDIR;
pip install ".[test]" -d $WHEELDIR -f $WHEELHOUSE $PRE $VERSIONS;
pip install ".[$EXTRAS]" -d $WHEELDIR -f $WHEELHOUSE $PRE $VERSIONS;
touch $WHEELDIR/download_marker;
travis_wait pip wheel ".[test]" -w $WHEELDIR -f $WHEELHOUSE $PRE $VERSIONS;
rm -f $WHEELDIR/MetPy*.whl;
travis_wait pip wheel ".[$EXTRAS]" -w $WHEELDIR -f $WHEELHOUSE $PRE $VERSIONS;
rm -f $WHEELDIR/siphon*.whl;
fi

install:
- if [[ $TASK != "lint" ]]; then
pip install ".[test]" --upgrade --no-index -f file://$PWD/$WHEELDIR $VERSIONS;
pip install ".[$EXTRAS]" --upgrade --no-index -f file://$PWD/$WHEELDIR $VERSIONS;
if [[ $TASK == "examples" ]]; then
python setup.py examples;
fi;
Expand Down
1 change: 0 additions & 1 deletion examples/requirements.txt

This file was deleted.

3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ def run(self):
'dev': ['ipython[all]>=3.1'],
'doc': ['sphinx>=1.3', 'ipython[all]>=3.1'],
'test': ['nose', 'netCDF4>=1.1.0',
'vcrpy~=1.5,!=1.7.0,!=1.7.1,!=1.7.2,!=1.7.3']
'vcrpy~=1.5,!=1.7.0,!=1.7.1,!=1.7.2,!=1.7.3'],
'examples': ['matplotlib>=1.3']
},

download_url='https://github.com/Unidata/siphon/archive/v%s.tar.gz' % ver,)

0 comments on commit 5386fad

Please sign in to comment.