Skip to content

Commit f90013e

Browse files
committed
Update environment for doc build (#2708)
* Update environment for doc build We were pinning very old versions for most of these packages. This should fix the failures on ReadTheDocs. * Build fixes
1 parent 8281902 commit f90013e

File tree

6 files changed

+28
-25
lines changed

6 files changed

+28
-25
lines changed

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ script:
7878
- python --version
7979
- python -OO -c "import xarray"
8080
- if [[ "$CONDA_ENV" == "docs" ]]; then
81-
conda install -c conda-forge sphinx sphinx_rtd_theme sphinx-gallery numpydoc;
82-
sphinx-build -n -j auto -b html -d _build/doctrees doc _build/html;
83-
elif [[ "$CONDA_ENV" == "flake8" ]]; then
84-
flake8 xarray ;
81+
cd doc;
82+
sphinx-build -n -j auto -b html -d _build/doctrees . _build/html;
83+
elif [[ "$CONDA_ENV" == "lint" ]]; then
84+
pycodestyle xarray ;
8585
elif [[ "$CONDA_ENV" == "py36-hypothesis" ]]; then
8686
pytest properties ;
8787
else

ci/requirements-py36.yml

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ dependencies:
2222
- zarr
2323
- pseudonetcdf>=3.0.1
2424
- eccodes
25+
- cdms2
26+
# - pynio # xref #2683
27+
# - iris>=1.10 # xref #2683
28+
- pydap
29+
- lxml
2530
- pip:
2631
- coveralls
2732
- pytest-cov

doc/environment.yml

+16-13
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,25 @@ name: xarray-docs
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.6
6-
- numpy=1.14.5
5+
- python=3.7
6+
- numpy=1.16.0
77
- pandas=0.23.3
8-
- scipy=1.1.0
9-
- matplotlib=2.2.2
8+
- scipy=1.2.0
9+
- matplotlib=3.0.2
1010
- seaborn=0.9.0
11-
- dask=0.18.2
12-
- ipython=6.4.0
13-
- netCDF4=1.4.0
14-
- cartopy=0.16.0
15-
- rasterio=1.0.1
11+
- dask=1.1.0
12+
- ipython=7.2.0
13+
- netCDF4=1.4.2
14+
- cartopy=0.17.0
15+
- rasterio=1.0.13
1616
- zarr=2.2.0
17-
- iris=2.1.0
18-
- flake8=3.5.0
17+
- iris=2.2.0
18+
- flake8=3.6.0
1919
- cftime=1.0.3.4
20-
- bottleneck=1.2
21-
- sphinx=1.7.6
20+
- bottleneck=1.2.1
21+
- sphinx=1.8.2
2222
- numpydoc=0.8.0
2323
- sphinx-gallery=0.2.0
24+
- pillow=5.4.1
25+
- sphinx_rtd_theme=0.4.2
26+
- mock=2.0.0

doc/examples/multidimensional-coords.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@ grid, we can take advantage of xarray's ability to apply
7878
ax = plt.axes(projection=ccrs.PlateCarree());
7979
ds.Tair[0].plot.pcolormesh(ax=ax, transform=ccrs.PlateCarree(),
8080
x='xc', y='yc', add_colorbar=False);
81-
ax.coastlines();
8281
@savefig xarray_multidimensional_coords_12_0.png width=100%
83-
plt.tight_layout();
82+
ax.coastlines();
8483
8584
Multidimensional Groupby
8685
------------------------

doc/pandas.rst

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ __ http://pandas.pydata.org/pandas-docs/stable/visualization.html
1414
__ http://stanford.edu/~mwaskom/software/seaborn/
1515

1616
.. ipython:: python
17-
:suppress:
17+
:suppress:
1818
1919
import numpy as np
2020
import pandas as pd
@@ -93,7 +93,6 @@ DataFrames:
9393
9494
s = ds['foo'].to_series()
9595
s
96-
9796
# or equivalently, with Series.to_xarray()
9897
xr.DataArray.from_series(s)
9998
@@ -173,11 +172,10 @@ So you can represent a Panel, in two ways:
173172
Let's take a look:
174173

175174
.. ipython:: python
176-
:okwarning:
175+
:okwarning:
177176
178177
panel = pd.Panel(np.random.rand(2, 3, 4), items=list('ab'), major_axis=list('mno'),
179178
minor_axis=pd.date_range(start='2000', periods=4, name='date'))
180-
181179
panel
182180
183181
As a DataArray:

doc/time-series.rst

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ core functionality.
1515
import numpy as np
1616
import pandas as pd
1717
import xarray as xr
18-
1918
np.random.seed(123456)
2019
2120
Creating datetime64 data
@@ -241,7 +240,6 @@ coordinate with dates from a no-leap calendar and a
241240
242241
from itertools import product
243242
from cftime import DatetimeNoLeap
244-
245243
dates = [DatetimeNoLeap(year, month, 1) for year, month in
246244
product(range(1, 3), range(1, 13))]
247245
da = xr.DataArray(np.arange(24), coords=[dates], dims=['time'], name='foo')

0 commit comments

Comments
 (0)