Skip to content

Conversation

@pp-mo
Copy link
Member

@pp-mo pp-mo commented Oct 18, 2017

Only #2823 is outstanding now from the "dask_mask project", and that doesn't actually need to happen before this.

lbdreyer and others added 30 commits July 24, 2017 17:18
Use the branch from dask PR#2301 in travis
…#2699)

Integrate with dask masked array support (just code changes, no tests fixes)
Remove fill_value from cube cml
Purge use of old _lazy_array functionality.
Remove usages of replace method
Fix DataManager unit tests and MaskedConstant in as_lazy
Lazy masked array fill_value retrieval
* PP + merge test fixes

* Review actions.
* Add skippers to all failing tests
* Fix concat tests, mostly reverted to v1.13
* Fixes for GRIB unit tests

* Fix GRIB _DataProxy tests

* Use .data instead of ._data
* upstream/master:
  matplotlib defaults for tests
  Set nosetests to run on 8 cores on travis
Feature branch merge: master into dask_mask_array
* Revert to latest normal dask version in Travis.

* Bump python3 test version to 3.6, to avoid netcdf build problem.
* Handle fill value on netCDF save
* Fix lazy stats; enhance mdtol test.

* Tidy lazy mdtol code; use dask.core.elemwise.

* pep8 fixes.

* Improved use of dask-mask code.

* Simplified with latest dask.

* Add lazy-stats tests for all 'axis' options.

* Efficient points count in _build_dask_mdtol_function.

* Simplify points-count calculation.

* Simpler lazy stats calculations for mdtol>=1.0

* Remove+fix final skip_dask_mask in analysis tests.
@pp-mo pp-mo requested review from djkirkham and pelson October 18, 2017 14:16
@djkirkham
Copy link
Contributor

I had hoped it would only show the last commit after #2813...

Remove core-dtype from Cube.xml() and references in result test files
@QuLogic
Copy link
Member

QuLogic commented Oct 18, 2017

Why would it do that? You're merging the other way. None of these commits are in master.

@pelson pelson added this to the v2.0.0 milestone Oct 19, 2017
@pelson
Copy link
Member

pelson commented Oct 19, 2017

Thanks @pp-mo & @djkirkham. Glad we don't have any complications with this merge - the dask_mask_array branch has been managed well and gives me confidence in this merge.

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.

8 participants