Skip to content

Commit

Permalink
Update environment for doc build (#2708)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
shoyer authored Jan 26, 2019
1 parent 2e99c7d commit 8ca8efe
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ script:
- python --version
- python -OO -c "import xarray"
- if [[ "$CONDA_ENV" == "docs" ]]; then
conda install -c conda-forge --override-channels sphinx sphinx_rtd_theme sphinx-gallery numpydoc "gdal>2.2.4";
sphinx-build -n -j auto -b html -d _build/doctrees doc _build/html;
cd doc;
sphinx-build -n -j auto -b html -d _build/doctrees . _build/html;
elif [[ "$CONDA_ENV" == "lint" ]]; then
pycodestyle xarray ;
elif [[ "$CONDA_ENV" == "py36-hypothesis" ]]; then
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements-py36.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ dependencies:
- pseudonetcdf>=3.0.1
- eccodes
- cdms2
# - pynio # xref #2683
# - iris>=1.10 # xref #2683
# - pynio # xref #2683
# - iris>=1.10 # xref #2683
- pydap
- lxml
- pip:
Expand Down
29 changes: 16 additions & 13 deletions doc/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,25 @@ name: xarray-docs
channels:
- conda-forge
dependencies:
- python=3.6
- numpy=1.14.5
- python=3.7
- numpy=1.16.0
- pandas=0.23.3
- scipy=1.1.0
- matplotlib=2.2.2
- scipy=1.2.0
- matplotlib=3.0.2
- seaborn=0.9.0
- dask=0.18.2
- ipython=6.4.0
- netCDF4=1.4.0
- cartopy=0.16.0
- rasterio=1.0.1
- dask=1.1.0
- ipython=7.2.0
- netCDF4=1.4.2
- cartopy=0.17.0
- rasterio=1.0.13
- zarr=2.2.0
- iris=2.1.0
- flake8=3.5.0
- iris=2.2.0
- flake8=3.6.0
- cftime=1.0.3.4
- bottleneck=1.2
- sphinx=1.7.6
- bottleneck=1.2.1
- sphinx=1.8.2
- numpydoc=0.8.0
- sphinx-gallery=0.2.0
- pillow=5.4.1
- sphinx_rtd_theme=0.4.2
- mock=2.0.0
3 changes: 1 addition & 2 deletions doc/examples/multidimensional-coords.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,8 @@ grid, we can take advantage of xarray's ability to apply
ax = plt.axes(projection=ccrs.PlateCarree());
ds.Tair[0].plot.pcolormesh(ax=ax, transform=ccrs.PlateCarree(),
x='xc', y='yc', add_colorbar=False);
ax.coastlines();
@savefig xarray_multidimensional_coords_12_0.png width=100%
plt.tight_layout();
ax.coastlines();
Multidimensional Groupby
------------------------
Expand Down
6 changes: 2 additions & 4 deletions doc/pandas.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ __ http://pandas.pydata.org/pandas-docs/stable/visualization.html
__ http://stanford.edu/~mwaskom/software/seaborn/

.. ipython:: python
:suppress:
:suppress:
import numpy as np
import pandas as pd
Expand Down Expand Up @@ -93,7 +93,6 @@ DataFrames:
s = ds['foo'].to_series()
s
# or equivalently, with Series.to_xarray()
xr.DataArray.from_series(s)
Expand Down Expand Up @@ -173,11 +172,10 @@ So you can represent a Panel, in two ways:
Let's take a look:

.. ipython:: python
:okwarning:
:okwarning:
panel = pd.Panel(np.random.rand(2, 3, 4), items=list('ab'), major_axis=list('mno'),
minor_axis=pd.date_range(start='2000', periods=4, name='date'))
panel
As a DataArray:
Expand Down
2 changes: 0 additions & 2 deletions doc/time-series.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ core functionality.
import numpy as np
import pandas as pd
import xarray as xr
np.random.seed(123456)
Creating datetime64 data
Expand Down Expand Up @@ -241,7 +240,6 @@ coordinate with dates from a no-leap calendar and a
from itertools import product
from cftime import DatetimeNoLeap
dates = [DatetimeNoLeap(year, month, 1) for year, month in
product(range(1, 3), range(1, 13))]
da = xr.DataArray(np.arange(24), coords=[dates], dims=['time'], name='foo')
Expand Down

0 comments on commit 8ca8efe

Please sign in to comment.