Skip to content

Commit

Permalink
Merge branch 'master' into feature/weighted
Browse files Browse the repository at this point in the history
  • Loading branch information
mathause committed Jan 14, 2020
2 parents 111259b + 4042345 commit 5afc6f3
Show file tree
Hide file tree
Showing 52 changed files with 3,047 additions and 1,367 deletions.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,5 @@ jobs:
- bash: |
source activate xarray-tests
cd doc
sphinx-build -n -j auto -b html -d _build/doctrees . _build/html
sphinx-build -W --keep-going -j auto -b html -d _build/doctrees . _build/html
displayName: Build HTML docs
1 change: 0 additions & 1 deletion ci/requirements/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ dependencies:
- seaborn
- sphinx
- sphinx_rtd_theme
- xarray
- zarr
Loading

0 comments on commit 5afc6f3

Please sign in to comment.