Skip to content

Conversation

@corinnebosley
Copy link
Member

@corinnebosley corinnebosley commented Oct 10, 2017

Removed deprecated classes from iris.fileformats.rules.py:

Rule
FunctionRule
ProcedureRule
RulesContainer

@corinnebosley
Copy link
Member Author

corinnebosley commented Oct 10, 2017

Closes #2674
Closes #2675
Closes #2676
Closes #2677

@corinnebosley
Copy link
Member Author

WIP: This PR needs some rethinking and reworking, so I am putting it on hold for now.

@LukeC92
Copy link
Contributor

LukeC92 commented Oct 13, 2017

@corinnebosley I see that this Pull Request is addressing #2675 by removing FunctionRule. Several of my Pull Requests have removed small parts of FunctionRule, could these cause conflicts or simplify the issue slightly?

The Pull Requests are #2791, #2794 and #2796 .

In each case I have removed a small deprecated class from lib/iris/fileformats/rules.py and some elif statements in FunctionRule._process_action_result .

Each of the Pull Requests pass all tests locally, so FunctionRule._process_action_result is clearly still able to function without the if statements I remove.

From memory I can remove the deprecated classes without touching FunctionRule at all; it's just there'll be some if statements left in it which will do nothing.

@corinnebosley
Copy link
Member Author

@dkillick This morning I have also removed 'Rule' and 'RuleResult' from this module as they were also part of the deprecated rules text-file process.

@DPeterK DPeterK self-assigned this Oct 17, 2017


# A flag to control all the text-rules and rules-logging deprecation warnings.
_enable_rules_deprecations = True
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll need to remove this (and the following function) at some point... but not here. How about in #2670?

@DPeterK DPeterK merged commit 347752b into SciTools:master Oct 17, 2017
@DPeterK
Copy link
Member

DPeterK commented Oct 17, 2017

This PR had to wait a little to get merged! Good job @corinnebosley

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.

4 participants