Skip to content

Commit

Permalink
Some changes to CI installations.
Browse files Browse the repository at this point in the history
  • Loading branch information
rlaverde committed Aug 30, 2017
1 parent 4c1dedc commit 557c4d6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
10 changes: 8 additions & 2 deletions ci/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,17 @@ conda install -q ciocheck -c spyder-ide --no-update-deps

# Install dependencies
if [ "$CIRCLE_NODE_INDEX" = "0" ]; then
pip install -q markdown pygments ipython nbformat nbconvert jupyter_client pyqt5 matplotlib
# python3.6, pweave from git/master
pip install -q matplotlib
pip install git+ssh://[email protected]/mpastell/Pweave.git
else
elif [ "$CIRCLE_NODE_INDEX" = "1" ]; then
# python3.5, latest pweave 0.30
conda install -q matplotlib pandoc
pip install -q pweave
else
# python2.7, legacy pweave 0.25 :(
conda install -q matplotlib
pip install -q pweave==0.25
fi

# Bring Spyder dependencies (install/uninstall Spyder)
Expand Down
6 changes: 3 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ machine:
environment:
# Python versions to tests (Maximum of 4 different versions)
# The last container is used to test with pyqt5 wheels
# python3.6. pip, pweave 0.3alpha from git/master
# python3.5 conda, pweave 0.2.5
# python2.7 conda, pweave 0.2.5
# python3.6, pweave from git/master
# python3.5, latest pweave 0.30
# python2.7, legacy pweave 0.25 :(
PY_VERSIONS: "3.6 3.5 2.7"
# Environment variables used by astropy helpers
TRAVIS_OS_NAME: "linux"
Expand Down

0 comments on commit 557c4d6

Please sign in to comment.