Skip to content
forked from pydata/xarray

Commit

Permalink
Merge branch 'master' of github.com:pydata/xarray into optimize-lazy-…
Browse files Browse the repository at this point in the history
…equiv

* 'master' of github.com:pydata/xarray: (28 commits)
  Add nanmedian for dask arrays (pydata#3604)
  added pyinterp to related projects (pydata#3655)
  Allow incomplete hypercubes in combine_by_coords (pydata#3649)
  concat keeps attrs from first variable. (pydata#3637)
  Extend DatetimeAccessor properties and support `.dt` accessor for Timedelta (pydata#3612)
  update readthedocs.yml (pydata#3639)
  silence sphinx warnings round 3 (pydata#3602)
  Fix/quantile wrong errmsg (pydata#3635)
  Provide shape info in shape mismatch error. (pydata#3619)
  Minor doc fixes (pydata#3615)
  Respect user-specified coordinates attribute. (pydata#3487)
  Add Facetgrid.row_labels & Facetgrid.col_labels (pydata#3597)
  Fix pint integration tests (pydata#3600)
  Minor fix to combine_by_coords to allow for the combination of CFTimeIndexes separated by large time intervals (pydata#3543)
  Fix map_blocks HLG layering (pydata#3598)
  Silence sphinx warnings: Round 2 (pydata#3592)
  2x~5x speed up for isel() in most cases (pydata#3533)
  remove xarray again (pydata#3591)
  fix plotting with transposed nondim coords. (pydata#3441)
  make coarsen reductions consistent with reductions on other classes (pydata#3500)
  ...
  • Loading branch information
dcherian committed Dec 30, 2019
2 parents 1972fde + b3d3b44 commit 9291b91
Show file tree
Hide file tree
Showing 53 changed files with 3,196 additions and 1,438 deletions.
39 changes: 39 additions & 0 deletions .binder/environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: xarray-examples
channels:
- conda-forge
dependencies:
- python=3.7
- boto3
- bottleneck
- cartopy
- cdms2
- cfgrib
- cftime
- coveralls
- dask
- distributed
- dask_labextension
- h5netcdf
- h5py
- hdf5
- iris
- lxml # Optional dep of pydap
- matplotlib
- nc-time-axis
- netcdf4
- numba
- numpy
- pandas
- pint
- pip
- pydap
- pynio
- rasterio
- scipy
- seaborn
- sparse
- toolz
- xarray
- zarr
- pip:
- numbagg
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
4 changes: 3 additions & 1 deletion ci/azure/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ steps:
git+https://github.com/dask/dask \
git+https://github.com/dask/distributed \
git+https://github.com/zarr-developers/zarr \
git+https://github.com/Unidata/cftime
git+https://github.com/Unidata/cftime \
git+https://github.com/mapbox/rasterio \
git+https://github.com/pydata/bottleneck
condition: eq(variables['UPSTREAM_DEV'], 'true')
displayName: Install upstream dev dependencies

Expand Down
6 changes: 1 addition & 5 deletions ci/requirements/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.7
- bottleneck
- cartopy
- eccodes
- cfgrib
- h5netcdf
- ipykernel
- ipython
Expand All @@ -22,7 +22,3 @@ dependencies:
- sphinx
- sphinx_rtd_theme
- zarr
- pip
- pip:
- cfgrib

Loading

0 comments on commit 9291b91

Please sign in to comment.