Skip to content

Conversation

@pp-mo
Copy link
Member

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

Merged master back into the feature branch 'dask_mask_array'.

bayliffe and others added 30 commits August 31, 2017 11:34
* Moving percentile method changes into Iris V2.

* Changes requested by Pete. Restoration of CML testing in unit tests, with new KGO for new method.

* Removed _check_coord_properties function now that CML tests have been reimplemented.
* Remove deprecated ignore args

* Remove unused import; Remove uses of ignore kwarg
….pp_packing (SciTools#2689)

* Remove deprecated iris.unit

* Remove deprecated pp_packing

* fully remove pp_packing from setup.py

* Remove deprecated iris.proxy

* fix travis instructions to not build pp_packing

* Fix copyright year
* Remove pp deprecations

* remove tests using deprecated _LBPROC methods.

* Auto-review actions
* Correct STASH regular expression
SciTools#2778)

* Removed deprecated kwarg 'legacy_custom_rules' from 'iris.fileformats.rules.Loader'

* corrected some tests

* fixed another test
* Remove deprecated module interpolate.py

* Remove usages of deleted function

* Coding standards fix
* Remove cube module deprecations

(cherry picked from commit b5b7b07)

* Remove usages from test_regrid.py

* Test fixes

* coding standards correction
(cherry picked from commit c175850)
* Remove BitwiseInt class and tests thereof.

* Change _LBProc inheritance
* Remove references to SAMPLE_DATA_DIR. Move some tests

* ValueError -> ImportError
* Remove iris.experimental.fieldsfiles module

* Review actions: keep and move existing test modules

* Changes to get tests passing

* Common test result format

* Update result files
* Deleted the class iris.fileformats.rules.DebugString

* Removed an elif statement from FunctionRule._process_action_result
Fix for pandas.as_dataframe when cube data array is a view
* Translate text PP save rules to Python

* Update rule function names

* Plumb in changes

* Changes from running tests

* Final test-related changes

* Changes to get the tests passing; a review action

* License headers

* Reorganisation of pp lbproc_pairs feature. (#12)

* Move lbproc_map to avoid circular import

* Reorganisation of pp lbproc_pairs feature.

* Remove unneeded lines
* Removed class iris.fileformats.rules.CoordAndDims

* Removed code and comment referring to CoordAndDims.

* Changed elif to if now all tests pass.
corinnebosley and others added 9 commits October 17, 2017 10:49
* broke some rules

* removed RulesContainer and corrected some tests

* fixed more tests....

* Removed Rule, which is also deprecated and covered by this PRÂ

* Removed RuleResult which is only used in RulesContainer

* Also removed rules_execution_environment and bits that go with it
* Remove deprecated function analysis.linear

* Remove missed usage of linear

* Remove test module for deprecated function
* Remove analysis.regrid and extract_nearest_nbr

* Remove deprecated function `nearest_neighbour_indices`

(cherry picked from commit 7b07083)

* Remove ref to deleted test class
* Rename pp_rules to pp_load_rules

* License header updates

* Correct outstanding references to `pp_rules`

* Add whatsnew entry

* Correct pep8 failure

* Update license header
* removed CMAttribute and very old text file

* removed unused imports

* fixed some rebase mistakes

* corrected import error in geometry test

* update licence header
@pp-mo pp-mo changed the base branch from master to dask_mask_array October 18, 2017 11:49
@pelson pelson self-requested a review October 18, 2017 12:44
@pelson pelson merged commit e242969 into SciTools:dask_mask_array Oct 18, 2017
@djkirkham djkirkham mentioned this pull request Oct 18, 2017
@QuLogic QuLogic added this to the dask-mask milestone Oct 18, 2017
@pp-mo pp-mo deleted the dask_maskarray_merge_master branch March 18, 2022 15:29
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.