Skip to content

Commit

Permalink
Stop 3.5 running hyperspy
Browse files Browse the repository at this point in the history
  • Loading branch information
gb119 committed Jul 18, 2019
1 parent f0dd38b commit 0877fb3
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Expand Up @@ -43,8 +43,10 @@ install:
- conda install --yes stoner
# Force upgraded scikit-image
# - conda install --yes scikit-image
# Hyperspy is now an optional dependency
- if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then sleep 1; else conda install --yes -c conda-forge hyperspy; fi
# Hyperspy is now an optional dependency for 3.6 onwards
- if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]] || [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]] ; then
conda install --yes -c conda-forge hyperspy;
fi
# Now we unistall the stable stoner - use force to stop downgrading packages!
- conda remove --yes --force stoner
- pip install opencv_python
Expand Down

0 comments on commit 0877fb3

Please sign in to comment.