Skip to content

[BTR-39] Cherry-pick warning squash commits - #25714

Merged
nedbat merged 4 commits into
openedx:open-release/koa.masterfrom
open-craft:0x29a/cherry-pick-warning-squashes
Dec 1, 2020
Merged

[BTR-39] Cherry-pick warning squash commits#25714
nedbat merged 4 commits into
openedx:open-release/koa.masterfrom
open-craft:0x29a/cherry-pick-warning-squashes

Conversation

@0x29a

@0x29a 0x29a commented Dec 1, 2020

Copy link
Copy Markdown
Contributor

PR's with warning squashes against edx-platform:

  1. https://github.com/edx/edx-platform/pull/25457
  2. https://github.com/edx/edx-platform/pull/25401
  3. https://github.com/edx/edx-platform/pull/25527
  4. https://github.com/edx/edx-platform/pull/25542
  5. https://github.com/edx/edx-platform/pull/25595
  6. https://github.com/edx/edx-platform/pull/25604
  7. https://github.com/edx/edx-platform/pull/25617
  8. https://github.com/edx/edx-platform/pull/25645
  9. https://github.com/edx/edx-platform/pull/25646

Commits from PR's above:

  1. 274c5a893beeec775086b634a22a0f496411108e — committed before branch cut.
  2. d1a775d3cd3da6634f82351034e3ef0199275031 — committed before branch cut.
  3. 3a46e7c5f500667c139419e82edb98e052df7e79 — committed before branch cut.
  4. 24ee08dcbb98a9685ce8c3cb039ebc8d474e14c2 — committed before branch cut.
  5. ae81d3347f677cce168582b7e1ea997539829b41 — cherry-picked in this PR.
  6. 9a7214831038b668ee6567d8aa30a1cf346d22eb — cherry-picked in 142407516167a9fdcaa78e4d54fead6a55b29ed3.
  7. 7a575843ca142e82082f1261cc8a8184b798af20 — cherry-picked in this PR.
  8. 8961db4f1044ccef2237f93d11bc2839209cdcea — cherry-picked in this PR.
  9. c83a505635870a67053a6061dc05dd19eed561c9 — cherry-picked in this PR.

Dependencies with warning squashes:

  1. Squash DRF deprecation warnings django-user-tasks#97django-user-tasks==1.3.1, updated in this PR.
  2. remove DeprecatedEdxPlatformImportWarning staff-graded-xblock#29 — new release required.
  3. Sof/squash warnings edx-enterprise#1052 — new release required.

feanil and others added 4 commits December 1, 2020 14:49
DeprecationWarning: The unescape method is deprecated and will be
removed in 3.5, use html.unescape() instead.

(cherry picked from commit ae81d33)
(cherry picked from commit 8961db4)
@openedx-webhooks

openedx-webhooks commented Dec 1, 2020

Copy link
Copy Markdown

Thanks for the pull request, @0x29a! I've created OSPR-5268 to keep track of it in JIRA, where we prioritize reviews. Please note that it may take us up to several weeks or months to complete a review and merge your PR.

Feel free to add as much of the following information to the ticket:

  • supporting documentation
  • Open edX discussion forum threads
  • timeline information ("this must be merged by XX date", and why that is)
  • partner information ("this is a course on edx.org")
  • any other information that can help Product understand the context for the PR

All technical communication about the code itself will be done via the GitHub pull request interface. As a reminder, our process documentation is here.

Please let us know once your PR is ready for our review and all tests are green.

@openedx-webhooks openedx-webhooks added open-source-contribution PR author is not from Axim or 2U waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. labels Dec 1, 2020
@0x29a
0x29a force-pushed the 0x29a/cherry-pick-warning-squashes branch from fcd30d4 to c637540 Compare December 1, 2020 14:52
@nedbat
nedbat merged commit 186a331 into openedx:open-release/koa.master Dec 1, 2020
@openedx-webhooks

Copy link
Copy Markdown

@0x29a 🎉 Your pull request was merged!

Please take a moment to answer a two question survey so we can improve your experience in the future.

@openedx-webhooks openedx-webhooks added merged and removed waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. labels Dec 1, 2020
@0x29a 0x29a changed the title [WIP] [BTR-39] Cherry-pick warning squash commits [BTR-39] Cherry-pick warning squash commits Dec 2, 2020
@0x29a
0x29a deleted the 0x29a/cherry-pick-warning-squashes branch December 2, 2020 09:45
@natabene

natabene commented Dec 2, 2020

Copy link
Copy Markdown
Contributor

@0x29a Thank you for your contribution.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged open-source-contribution PR author is not from Axim or 2U

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants