Skip to content

Commit

Permalink
allow CI to depend on master channel
Browse files Browse the repository at this point in the history
  • Loading branch information
jabooth committed Oct 28, 2014
1 parent 0716ead commit 02de297
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ install:
- wget https://raw.githubusercontent.com/jabooth/condaci/v0.2.0/condaci.py -O condaci.py
- python condaci.py setup $PYTHON_VERSION --channel $BINSTAR_USER
- export PATH=$HOME/miniconda/bin:$PATH
- conda config --add channels $BINSTAR_USER/channel/master

script:
- python condaci.py auto ./conda --binstaruser $BINSTAR_USER --binstarkey $BINSTAR_KEY
Expand Down
2 changes: 1 addition & 1 deletion conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ requirements:

run:
- python
- menpo 0.4.0
- menpo # 0.4.0 upon release
- cyassimp 0.2.0
- cyrasterize 0.2.0
- menpo-pyvrml97 2.3.0a4 # [py27]
Expand Down

0 comments on commit 02de297

Please sign in to comment.