diff --git a/.travis.yml b/.travis.yml index dcd64715..7968f36e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_install: - sed -i "s/pandas==.*/pandas==$PANDAS_VERSION/" etc/requirements.txt - sed -i "s/scipy==.*/scipy==$SCIPY_VERSION/" etc/requirements.txt install: - - conda install conda=4.0.9 conda-build=1.19.2 anaconda-client=1.3.1 --yes + - conda install conda=4.1.11 conda-build=1.21.11 anaconda-client=1.5.1 --yes - TALIB_VERSION=$(cat ./etc/requirements_talib.txt | sed "s/TA-Lib==\(.*\)/\1/") - conda create -n testenv --yes -c quantopian pip python=$TRAVIS_PYTHON_VERSION numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION libgfortran=1.0 ta-lib=$TALIB_VERSION diff --git a/appveyor.yml b/appveyor.yml index e0c0df3b..20082dd5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -82,7 +82,7 @@ install: - sed -i "s/scipy==.*/scipy==%SCIPY_VERSION%/" etc/requirements.txt - conda info -a - - conda install conda=4.0.9 conda-build=1.19.2 anaconda-client=1.3.1 --yes -q + - conda install conda=4.1.11 conda-build=1.21.11 anaconda-client=1.5.1 --yes -q # https://blog.ionelmc.ro/2014/12/21/compiling-python-extensions-on-windows/ for 64bit C compilation - ps: copy .\ci\appveyor\vcvars64.bat "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64" - "%CMD_IN_ENV% python .\\ci\\make_conda_packages.py" diff --git a/conda/zipline/meta.yaml b/conda/zipline/meta.yaml index f395b2a8..5d02b8bc 100644 --- a/conda/zipline/meta.yaml +++ b/conda/zipline/meta.yaml @@ -1,4 +1,4 @@ -{% set data = load_setuptools() %} +{% set data = load_setup_py_data() %} package: name: zipline @@ -28,12 +28,6 @@ requirements: {% endfor %} test: - {# When we include the tests module in the zipline package, we can use this: - requires: - {% for req in data.get('extras_require', {}).get('dev', []) -%} - - {{req}} - {% endfor %} - #} # Python imports imports: - zipline