Skip to content

Commit 922774d

Browse files
committed
Merge pull request #695 from xray/rtd-conda
Build docs on RTD using conda
2 parents 2810842 + 5013289 commit 922774d

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

doc/environment.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: xray
2+
dependencies:
3+
- python=2.7
4+
- numpy=1.10
5+
- pandas=0.17.1
6+
- numpydoc=0.5
7+
- seaborn=0.6
8+
- dask=0.7.5
9+
- ipython=4.0.1
10+
- sphinx=1.2.3 # pin to avoid https://github.com/sphinx-doc/sphinx/issues/1822

doc/examples/quick-overview.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ index labels and dimensions. It looks a lot like a netCDF file:
139139

140140
.. ipython:: python
141141
142-
ds = data.to_dataset()
142+
ds = data.to_dataset(name='foo')
143143
ds
144144
145145
You can do almost everything you can do with ``DataArray`` objects with

doc/indexing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ simultaneously, returning a new dataset:
176176

177177
.. ipython:: python
178178
179-
ds = arr.to_dataset()
179+
ds = arr.to_dataset(name='foo')
180180
ds.isel(space=[0], time=[0])
181181
ds.sel(time='2000-01-01')
182-
ds2 = da.to_dataset()
182+
ds2 = da.to_dataset(name='bar')
183183
ds2.isel_points(x=[0, 1, 6], y=[0, 1, 0], dim='points')
184184
185185
Positional indexing on a dataset is not supported because the ordering of

doc/requirements.txt

Lines changed: 0 additions & 12 deletions
This file was deleted.

readthedocs.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
conda:
2+
file: doc/environment.yml
3+
python:
4+
version: 2
5+
setup_py_install: true

0 commit comments

Comments
 (0)