diff --git a/Dockerfile b/Dockerfile index ac23c42c84..634a3dc2b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,6 +47,16 @@ RUN mkdir ${PROJECT_DIR} \ && apt-get -y install libfreetype6-dev libpng-dev libopenblas-dev liblapack-dev gfortran libhdf5-dev \ && curl -L https://downloads.sourceforge.net/project/ta-lib/ta-lib/0.4.0/ta-lib-0.4.0-src.tar.gz | tar xvz +# +# install Interactive Brokers API lib +# + +ADD http://interactivebrokers.github.io/downloads/twsapi_macunix.979.01.zip /ibapi/ +RUN unzip /ibapi/twsapi_macunix.979.01.zip 'IBJts/source/pythonclient/*' -d /ibapi/ \ + && cd /ibapi/IBJts/source/pythonclient \ + && python /ibapi/IBJts/source/pythonclient/setup.py install \ + && rm -rf /ibapi + # # build and install zipline from source. install TA-Lib after to ensure # numpy is available. @@ -55,7 +65,7 @@ RUN mkdir ${PROJECT_DIR} \ WORKDIR /ta-lib RUN pip install 'numpy>=1.11.1,<2.0.0' \ - && pip install 'scipy>=0.17.1,<1.0.0' \ + && pip install 'scipy>=0.17.1' \ && pip install 'pandas>=0.18.1,<1.0.0' \ && ./configure --prefix=/usr \ && make \ diff --git a/Dockerfile-dev b/Dockerfile-dev index 96a1c6bb03..e6fc3ad594 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -29,6 +29,4 @@ FROM quantopian/zipline WORKDIR /zipline -RUN pip install -r etc/requirements_dev.txt -r etc/requirements_blaze.txt -# Clean out any cython assets. The pip install re-builds them. -RUN find . -type f -name '*.c' -exec rm {} + && pip install -e .[all] +RUN pip install -r etc/requirements_dev.in -r etc/requirements_blaze.in && pip install -e .[all] diff --git a/etc/requirements_blaze.in b/etc/requirements_blaze.in index 68c8858c83..e58b64a5d2 100644 --- a/etc/requirements_blaze.in +++ b/etc/requirements_blaze.in @@ -1,7 +1,7 @@ -e git://github.com/quantopian/blaze.git@f26375a6708eab85b7acc7869d6c518df2f974eb#egg=blaze dask[dataframe]>=0.13.0 -e git://github.com/quantopian/datashape.git@cae16a85406ca4302ff1f985b74a3809be0a83a1#egg=datashape --e git://github.com/quantopian/odo.git@ba84238eb8dbcac4784ae7ebf62988d7e163c283#egg=odo +-e git://github.com/blaze/odo.git@c177bfad4c3a747458e699225c7bfeee957dc756#egg=odo # Keep cytoolz version in sync with toolz version in requirements.in cytoolz>=0.8.2