Update ipython on RTD (#1144)

pydata · Nov 30, 2016 · b21948d · b21948d
1 parent f6577d6
commit b21948d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/doc/combining.rst b/doc/combining.rst
@@ -205,6 +205,7 @@ have ``NaN`` values. This can be used to combine data with overlapping
 coordinates as long as any non-missing values agree or are disjoint:
 
 .. ipython:: python
+
     ds1 = xr.Dataset({'a': ('x', [10, 20, 30, np.nan])}, {'x': [1, 2, 3, 4]})
     ds2 = xr.Dataset({'a': ('x', [np.nan, 30, 40, 50])}, {'x': [2, 3, 4, 5]})
     xr.merge([ds1, ds2], compat='no_conflicts')

diff --git a/doc/environment.yml b/doc/environment.yml
@@ -3,14 +3,14 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python=3.5
+  - python=3.4.5
   - numpy=1.11.2
   - pandas=0.19.1
   - numpydoc=0.6.0
   - matplotlib=1.5.3
   - seaborn=0.7.1
   - dask=0.12.0
-  - ipython=4.0.1
+  - ipython=5.1.0
   - sphinx=1.4.8
   - netCDF4=1.2.4
   - hdf4=4.2.12  # temporary install to get netCD4 working (GH1106)