[BD-21] Switch to edx-toggles classes and deprecate waffle override methods by regisb · Pull Request #25417 · openedx/openedx-platform

regisb · 2020-10-23T10:20:43Z

This move is part of a migration from edx-platform's waffle_utils to edx-toggles.

~~This depends on an edx-toggles PR: openedx/edx-toggles#75~~ Merged ✔️
~~This depends~~ This does not depend anymore on edx/completion PR: openedx/completion#118

~~This is not yet ready for review.~~

TODO:

~~migrate WafleSwitch.override method~~
~~rebase on top of master once https://github.com/edx/edx-platform/pull/25286 is merged~~

openedx-webhooks · 2020-10-23T10:20:49Z

Thanks for the pull request, @regisb! I've created BLENDED-640 to keep track of it in Jira. More details are on the BD-21 project page.

When this pull request is ready, tag your edX technical lead.

regisb · 2020-10-26T13:28:29Z

The remaining broken unit test looks flaky to me, as I can't reproduce the behaviour locally.

regisb · 2020-10-26T14:54:22Z

This should now be ready to review cc @robrap

robrap

For many of my comments, it may be ok to refactor, to add an appropriate comment, or to explain why you don't think either is appropriate. You'll see. :)
Thanks.

regisb · 2020-10-29T10:04:22Z

Thanks for the thorough review of this difficult PR @robrap I appreciate it :) I pushed additional changes to resolve some of your comments. Please mark them as resolved accordingly (or comment).

robrap

Thanks. Just some minor updates needed, as well as handling conflicts.

regisb · 2020-11-03T08:31:05Z

@robrap I rebased my PR to resolve conflicts and added just one commit with the proposed changes, to make it easier to review.

robrap

Thanks. Let me know when this is squashed and ready to merge.

This is part of a removal of the many override methods of toggle flag/namespace classes. This allows us to remove imports of test modules from production code.

This allows us to get rid of waffle_utils' custom WaffleFlag method.

This allows us to get rid of the custom WaffleSwitch and WaffleSwitchNamespace classes from waffle_utils in favour of edx_toggles.toggles classes.

Those classes were ported to edx_toggles. The imports remain in waffle_utils.__init__ for backward compatibility.

These functions should from now on be imported from edx_toggles.toggles.testutils.

This is for backward compatibility.

regisb · 2020-11-03T18:26:23Z

This is squashed and ready to merge.

edx-status-bot · 2020-11-03T18:46:20Z

Your PR has finished running tests. There were no failures.

edx-pipeline-bot · 2020-11-03T20:08:56Z

EdX Release Notice: This PR has been deployed to the staging environment in preparation for a release to production.

edx-pipeline-bot · 2020-11-03T20:19:51Z

EdX Release Notice: This PR may have caused e2e tests to fail on Stage. If you're a member of the edX org, please visit #e2e-troubleshooting on Slack to help diagnose the cause of these failures. Otherwise, it is the reviewer's responsibility. E2E tests have failed. https://gocd.tools.edx.org/go/tab/pipeline/history/deploy_to_stage

edx-pipeline-bot · 2020-11-03T21:31:32Z

EdX Release Notice: This PR has been deployed to the production environment.

openedx-webhooks added blended PR is managed through 2U's blended developmnt program waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. labels Oct 23, 2020

regisb force-pushed the regisb/deprecate-toggle-override branch from 0bebabc to 200ba98 Compare October 23, 2020 13:01

regisb mentioned this pull request Oct 23, 2020

[BD-21] Backport override_waffle_switch from edx-platform openedx/edx-toggles#75

Merged

10 tasks

regisb force-pushed the regisb/deprecate-toggle-override branch 8 times, most recently from 7ce2969 to 2f03966 Compare October 26, 2020 08:41

regisb changed the title ~~[BD-21] Deprecate waffle override methods (WIP)~~ [BD-21] Deprecate waffle override methods Oct 26, 2020

openedx-webhooks added needs triage and removed waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. labels Oct 26, 2020

regisb force-pushed the regisb/deprecate-toggle-override branch 7 times, most recently from 80f1fc9 to 1c19226 Compare October 28, 2020 08:33

robrap reviewed Oct 29, 2020

View reviewed changes

robrap mentioned this pull request Oct 29, 2020

[BD-21] Move waffle_utils from edx-platform to edx-toggles #25286

Merged

2 tasks

regisb mentioned this pull request Oct 29, 2020

[BD-21] Make use of edx_toggles newest API for testing openedx/completion#118

Merged

11 tasks

regisb force-pushed the regisb/deprecate-toggle-override branch from 91177fa to 902274b Compare October 29, 2020 12:11

regisb force-pushed the regisb/deprecate-toggle-override branch 6 times, most recently from 49d6dba to 3a12cba Compare October 31, 2020 10:02

robrap reviewed Nov 3, 2020

View reviewed changes

Comment thread openedx/core/djangoapps/waffle_utils/__init__.py Outdated

Comment thread openedx/core/djangoapps/waffle_utils/__init__.py Outdated

Comment thread openedx/core/djangoapps/waffle_utils/__init__.py Outdated

robrap changed the title ~~[BD-21] Deprecate waffle override methods~~ [BD-21] Switch to eedx-toggles classes and deprecate waffle override methods Nov 3, 2020

robrap changed the title ~~[BD-21] Switch to eedx-toggles classes and deprecate waffle override methods~~ [BD-21] Switch to edx-toggles classes and deprecate waffle override methods Nov 3, 2020

regisb force-pushed the regisb/deprecate-toggle-override branch from 3a12cba to 536f57b Compare November 3, 2020 08:30

regisb force-pushed the regisb/deprecate-toggle-override branch from 536f57b to e1551d4 Compare November 3, 2020 09:29

regisb mentioned this pull request Nov 3, 2020

[BD-21] Deprecate waffle namespaces openedx/edx-toggles#80

Merged

10 tasks

robrap approved these changes Nov 3, 2020

View reviewed changes

regisb added 6 commits November 3, 2020 19:25

Deprecate ExperimentWaffleFlag.override method

16ce16e

This is part of a removal of the many override methods of toggle flag/namespace classes. This allows us to remove imports of test modules from production code.

Deprecate WaffleFlag.override method

2307dff

This allows us to get rid of waffle_utils' custom WaffleFlag method.

Deprecate WaffleSwitch.override* methods

3b127f8

This allows us to get rid of the custom WaffleSwitch and WaffleSwitchNamespace classes from waffle_utils in favour of edx_toggles.toggles classes.

Import waffle classes from edx_toggles instead of waffle_utils

4586002

Those classes were ported to edx_toggles. The imports remain in waffle_utils.__init__ for backward compatibility.

Deprecate waffle_utils.testutils.override* functions

b700424

These functions should from now on be imported from edx_toggles.toggles.testutils.

Re-introduce waffle classes (with deprecation warnings)

c9c1136

This is for backward compatibility.

regisb force-pushed the regisb/deprecate-toggle-override branch from e1551d4 to c9c1136 Compare November 3, 2020 18:25

robrap merged commit 4a0e4aa into openedx:master Nov 3, 2020

openedx-webhooks added merged and removed needs triage labels Nov 3, 2020

regisb deleted the regisb/deprecate-toggle-override branch November 3, 2020 21:11

Uh oh!

Conversation

regisb commented Oct 23, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openedx-webhooks commented Oct 23, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

regisb commented Oct 26, 2020

Uh oh!

regisb commented Oct 26, 2020

Uh oh!

robrap left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

regisb commented Oct 29, 2020

Uh oh!

robrap left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

regisb commented Nov 3, 2020

Uh oh!

robrap left a comment

Choose a reason for hiding this comment

Uh oh!

regisb commented Nov 3, 2020

Uh oh!

edx-status-bot commented Nov 3, 2020

Uh oh!

edx-pipeline-bot commented Nov 3, 2020

Uh oh!

edx-pipeline-bot commented Nov 3, 2020

Uh oh!

edx-pipeline-bot commented Nov 3, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

regisb commented Oct 23, 2020 •

edited

Loading

openedx-webhooks commented Oct 23, 2020 •

edited

Loading