diff --git a/.travis.yml b/.travis.yml index 61f419a9..69d0407d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ install: - conda install --yes -c https://conda.binstar.org/Quantopian numpy=$NUMPY_VERSION pandas=$PANDAS_VERSION scipy==$SCIPY_VERSION matplotlib Cython patsy statsmodels tornado pyparsing xlrd mock pytz requests six dateutil ta-lib logbook - pip install --upgrade pip nose-timer coverage - pip install -e .[dev] - - pip install -e .[blaze] + - pip install -r etc/requirements_blaze.txt before_script: - "flake8 zipline tests" script: diff --git a/setup.py b/setup.py index 630a2805..0ee21c9d 100644 --- a/setup.py +++ b/setup.py @@ -134,12 +134,10 @@ def install_requires(): def extras_requires(): dev_reqs = read_requirements('etc/requirements_dev.txt') talib_reqs = ['TA-Lib==0.4.9'] - blaze_reqs = read_requirements('etc/requirements_blaze.txt') return { 'dev': dev_reqs, 'talib': talib_reqs, - 'blaze': blaze_reqs, - 'all': sum((dev_reqs, talib_reqs, blaze_reqs), []), + 'all': dev_reqs + talib_reqs, }