Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,17 @@ language: python
cache:
pip: true
directories:
- $HOME/miniconda
# osx-specific caches
- $HOME/Library/Caches/pip

addons:
apt:
packages:
- hdf5-tools
homebrew:
packages:
- hdf5

matrix:
include:
- python: 3.6
Expand All @@ -25,11 +32,6 @@ matrix:
- pip install virtualenv
- virtualenv env -p python3
- source env/bin/activate
- wget https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
- chmod +x miniconda.sh
- ./miniconda.sh -u -b -p $HOME/miniconda
- export PATH=$HOME/miniconda/bin:$PATH
- conda update --yes conda

notifications:
email: false
Expand All @@ -38,19 +40,9 @@ branches:
only:
- master

before_install:
- wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- chmod +x miniconda.sh
- ./miniconda.sh -u -b -p /home/travis/miniconda
- export PATH=/home/travis/miniconda/bin:$PATH
- conda update --yes conda
#- sudo rm -rf /dev/shm
#- sudo ln -s /run/shm /dev/shm

install:
- conda install --yes python=$TRAVIS_PYTHON_VERSION ipython numpy scipy nose pandas pip sympy pytables statsmodels numba
# To Install Full Anaconda Stack (conda install --yes python=$TRAVIS_PYTHON_VERSION anaconda)
- pip install coveralls coverage
- pip install -U pip nose coveralls coverage numpy scipy pandas numba sympy ipython statsmodels
- pip install tables
- python setup.py install

script:
Expand Down
1 change: 0 additions & 1 deletion quantecon/discrete_rv.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import numpy as np
from numpy import cumsum
from numpy.random import uniform
from .util import check_random_state


Expand Down
4 changes: 0 additions & 4 deletions quantecon/tests/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,8 @@ def get_data_dir():

def get_h5_data_file():
"""
<<<<<<< HEAD
return the data file used for holding test data. If the data
directory or file do not exist, they are created.
=======
return the data file used for holding test data
>>>>>>> master

Notes
-----
Expand Down