Skip to content

Commit

Permalink
Merge pull request #124 from choderalab/fix-travis
Browse files Browse the repository at this point in the history
Fix travis failures on osx
  • Loading branch information
jchodera committed Oct 22, 2017
2 parents c8b276a + 6a6aefa commit fdae471
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Expand Up @@ -20,8 +20,9 @@ before_script:
- sleep 3 # give xvfb some time to start

script:
# Add org channel
- conda config --add channels ${ORGNAME} --add channels conda-forge
# Add org channel and force update
- conda config --add channels omnia --add channels conda-forge
- conda update --yes conda
# Create a test environment
- conda create --yes -n test python=$python
# Activate the test environment
Expand Down
4 changes: 2 additions & 2 deletions devtools/conda-recipe/meta.yaml
Expand Up @@ -16,7 +16,7 @@ requirements:
- numpy
- pandas
- scipy
- openblas
- openblas ==0.2.19
- pymc
- matplotlib
- seaborn
Expand All @@ -35,7 +35,7 @@ requirements:
- pint
- pandas
- scipy
- openblas
- openblas ==0.2.19
- pymc
- matplotlib
- seaborn
Expand Down

0 comments on commit fdae471

Please sign in to comment.