Skip to content

Merge Upstream to Ouranosinc/master #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Dec 19, 2018
Merged

Conversation

Zeitsperre
Copy link

No description provided.

DaDaDaDaDaLi and others added 30 commits November 1, 2018 21:36
* fixed typo

* added test for saving opened zarr dataset

* modified test for saving opened zarr dataset

* allow different last chunk

* removed whitespace

* modified error messages

* fixed pep8 issues

* updated whats-new
* Start deprecating inplace.

* remove warnings from tests.

* this commit silences nearly all warnings.

* Add whats-new.

* Add a default kwarg to _check_inplace and use for Dataset.update.

* Major fix!

* Add stacklevel

* Tests: Less aggressive warning filter + fix unnecessary inplace.

* revert changes to _calculate_binary_op
This has been deprecated since xarray 0.10.

I also added support for passing a mapping ``{dim: freq}`` as the first
argument.
* putting up for discussion: stop loading tutorial data by default

* add tutorial.open_dataset

* fix typo

* add test for cached tutoreial data and minor doc fixes
…2555)

* Add libnetcdf, libhdf5, pydap and cfgrib to xarray.show_versions()

* More fixup

* Show full Python version string
Add missing , and article in error message when attribute values have the wrong type.
This makes string indexing usable in a pandas.MultiIndex.
* DOC: remove example using Dataset.T

* Update reshaping.rst

* Update reshaping.rst
* Fix multidimensional co-ordinate example.

* Use open_dataset().load() in other example
* wip: getting started

* preliminary support for zarr consolidated metadata

* update zarr dev repo

* add consolidate to close

* doc updates

* skip tests based on zarr version

* fix doc typos

* fix PEP8 issues

* fix test skipping

* fixed integration test

* update version check

* rename keyword arg

* Update whats-new.rst

* instructions for consolidating existing stores
This version should be a little less noisy, since instructions only for
authors are put in commented out HTML.
* Fix h5netcdf saving scalars with filters or chunks

* Revert adding scalar dataset to central test function

* Add fix description to what's new.
* Add keep_attrs to binary_op

* added test for binary_ops keep_attrs=True

* PEP8 issues + blank lines removed

* whitespace removed

* keep_attrs in DataArray

* enhancement

* simpler testing
* Support HighLevelGraphs

Fixes #4291

* test __dask_layers__

* Skip dependnecies test with old dask

* Reenable dask-dev test on Travis-CI
TomNicholas and others added 5 commits December 13, 2018 09:15
* concatenates along a single dimension

* Wrote function to find correct tile_IDs from nested list of datasets

* Wrote function to check that combined_tile_ids structure is valid

* Added test of 2d-concatenation

* Tests now check that dataset ordering is correct

* Test concatentation along a new dimension

* Started generalising auto_combine to N-D by integrating the N-D concatentation algorithm

* All unit tests now passing

* Fixed a failing test which I didn't notice because I don't have pseudoNetCDF

* Began updating open_mfdataset to handle N-D input

* Refactored to remove duplicate logic in open_mfdataset & auto_combine

* Implemented Shoyers suggestion in #2553 to rewrite the recursive nested list traverser as an iterator

* --amend

* Now raises ValueError if input not ordered correctly before concatenation

* Added some more prototype tests defining desired behaviour more clearly

* Now raises informative errors on invalid forms of input

* Refactoring to alos merge along each dimension

* Refactored to literally just apply the old auto_combine along each dimension

* Added unit tests for open_mfdatset

* Removed TODOs

* Removed format strings

* test_get_new_tile_ids now doesn't assume dicts are ordered

* Fixed failing tests on python3.5 caused by accidentally assuming dict was ordered

* Test for getting new tile id

* Fixed itertoolz import so that it's compatible with older versions

* Increased test coverage

* Added toolz as an explicit dependency to pass tests on python2.7

* Updated 'what's new'

* No longer attempts to shortcut all concatenation at once if concat_dims=None

* Rewrote using itertools.groupby instead of toolz.itertoolz.groupby to remove hidden dependency on toolz

* Fixed erroneous removal of utils import

* Updated docstrings to include an example of multidimensional concatenation

* Clarified auto_combine docstring for N-D behaviour

* Added unit test for nested list of Datasets with different variables

* Minor spelling and pep8 fixes

* Reverted API so that N-D generalisation is hidden

* Removed infer_order_from_coords argument
* Fix parsing '_Unsigned' attribute

Fixes #2583

* Fix encode step too.

* Add tests.

* Fix whats-new.

* Undo unnecessary change

* Yay! fix test failure.
* doc fixes

Fixes #2610

* minor doc fixes.

* Fix examples path for open statements.
@jwenfai jwenfai merged commit a4c9ab5 into Ouranosinc:master Dec 19, 2018
jwenfai added a commit that referenced this pull request Jan 16, 2019
Updating to latest xarray.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.