Skip to content

Commit

Permalink
Try to stop hyperspy allowing conda-forge to updae everything
Browse files Browse the repository at this point in the history
  • Loading branch information
gb119 committed Dec 2, 2019
1 parent 1f16d03 commit 2769595
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ install:
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda config --append channels phygbu
- conda config --add channels phygbu
- conda config --append channels conda-forge
- conda config --set channel_priority strict
- conda update -q conda
# Useful for debugging any issues with conda
Expand All @@ -43,7 +44,7 @@ install:
# This will ensure we collect all the necessary dependencies so long as master doesn't change them!
# Hyperspy is now an optional dependency for 3.6 onwards
- if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]] || [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]] ; then
conda install -c conda-forge hyperspy;
conda install hyperspy;
fi
# Now we unistall the stable stoner - use force to stop downgrading packages!
- conda remove --yes --force stoner
Expand Down

0 comments on commit 2769595

Please sign in to comment.