Merge pull request #1386 from quantopian/conda-updates

Conda updates

.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

appveyor.yml

@@ -42,10 +42,6 @@ environment:
 platform:
   - x64
 
-# Using GCE to prevent the "input line is too long" error when activating a
-# conda env.
-image: Visual Studio 2015 - GCE
-
 cache:
   - '%LOCALAPPDATA%\pip\Cache'
 
@@ -82,7 +78,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"

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