Conflicts

fmaussion · fmaussion · commit d87782640bf4 · 2017-05-03T22:19:31.000+02:00
diff --git a/ci/requirements-py27-cdat+pynio.yml b/ci/requirements-py27-cdat+pynio.yml
@@ -18,7 +18,6 @@ dependencies:
   - scipy
   - seaborn
   - toolz
-  - cyordereddict
   - pip:
     - coveralls
     - pytest-cov
diff --git a/ci/requirements-py27-windows.yml b/ci/requirements-py27-windows.yml
@@ -1,4 +1,6 @@
 name: test_env
+channels:
+  - conda-forge
 dependencies:
   - python=2.7
   - dask
@@ -13,7 +15,3 @@ dependencies:
   - scipy
   - seaborn
   - toolz
-  - pip:
-    - coveralls
-    - pytest-cov
-    - pydap
diff --git a/ci/requirements-py35.yml b/ci/requirements-py35.yml
@@ -1,4 +1,6 @@
 name: test_env
+channels:
+  - conda-forge
 dependencies:
   - python=3.5
   - dask
@@ -13,7 +15,7 @@ dependencies:
   - scipy
   - seaborn
   - toolz
-  - rasterio>=1.0
+  - rasterio
   - pip:
     - coveralls
     - pytest-cov
diff --git a/ci/requirements-py36-netcdf4-dev.yml b/ci/requirements-py36-netcdf4-dev.yml
@@ -1,4 +1,6 @@
 name: test_env
+channels:
+  - conda-forge
 dependencies:
   - python=3.6
   - cython
@@ -12,7 +14,6 @@ dependencies:
   - pandas
   - scipy
   - toolz
-  - rasterio>=1.0
   - pip:
     - coveralls
     - pytest-cov
diff --git a/ci/requirements-py36-pandas-dev.yml b/ci/requirements-py36-pandas-dev.yml
@@ -1,4 +1,6 @@
 name: test_env
+channels:
+  - conda-forge
 dependencies:
   - python=3.6
   - cython
diff --git a/ci/requirements-py36-pydap.yml b/ci/requirements-py36-pydap.yml
@@ -13,7 +13,6 @@ dependencies:
   - numpy
   - scipy
   - toolz
-  - rasterio>=1.0
   - pip:
     - coveralls
     - pytest-cov
diff --git a/ci/requirements-py36.yml b/ci/requirements-py36.yml
@@ -1,4 +1,6 @@
 name: test_env
+channels:
+  - conda-forge
 dependencies:
   - python=3.6
   - dask
