Skip to content

Commit

Permalink
back to forcing numpy
Browse files Browse the repository at this point in the history
  • Loading branch information
eteq committed Dec 4, 2015
1 parent 8e7c297 commit 27e35a0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ os:
env:
global:
- PYTHON_VERSION=2.7
- NUMPY_VERSION=1.10
- ASTROPY_VERSION=1.0.6
- GH_REF: github.com/astropy/astropy-tutorials.git
- secure: "NBZlEg//sDYvJikqXESLsx/WA1Nj7fAH2mJfI8ZVMnolvyjJuLdEMxxEYFP8t6U/iieSSrgUkgP94yy5Oq6iJRjj7ThGCdcjgvgWTQCzoQgEVDc5SzdJGyGs30VC+8t7GTobzMe086HX16SJRvsIumqXdmRcJjAdMCyhMUxLoUg="
Expand Down
6 changes: 3 additions & 3 deletions .travis/setup_dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/bash

# CONDA
conda create --yes -n astropy-tutorials python=$PYTHON_VERSION astropy=$ASTROPY_VERSION
conda create --yes -n astropy-tutorials python=$PYTHON_VERSION numpy=$NUMPY_VERSION astropy=$ASTROPY_VERSION
source activate astropy-tutorials

# TUTORIALS/OPTIONAL DEPENDENCIES
conda install --yes python=$PYTHON_VERSION ipython ipython-notebook runipy matplotlib scipy h5py pyyaml beautifulsoup4
conda install --yes python=$PYTHON_VERSION numpy=$NUMPY_VERSION ipython ipython-notebook runipy matplotlib scipy h5py pyyaml beautifulsoup4

# if future tutorials need things from the astropy channel, they can use this
#conda install -c astropy-ci-extras python=$PYTHON_VERSION <deps here>
#conda install -c astropy-ci-extras python=$PYTHON_VERSION numpy=$NUMPY_VERSION <deps here>

0 comments on commit 27e35a0

Please sign in to comment.