Skip to content

Conversation

@pkulkark
Copy link
Contributor

@pkulkark pkulkark commented Jan 3, 2023

Description

Note: This PR depends on and includes the changes from #31475, which in turn depends on #31384. Use this link to see the actual diff.

This PR is the continuation of our previous effort to unify XBlock naming across the platform. This time, each descriptor occurrence reviewed and changed to block if it satisfied these criteria:

  • It meant "XBlock".
  • It was in *.py, *.rst, or *.md file.
  • It didn't mean "Descriptor System" or "descriptor runtime".

Supporting Information

This PR should be merged along with:

Testing Instructions

Use the sandbox to perform general testing (courseware, course tabs, activation emails, course authoring, course exporting/importing, etc):

@openedx-webhooks openedx-webhooks added the blended PR is managed through 2U's blended developmnt program label Jan 3, 2023
@openedx-webhooks
Copy link

openedx-webhooks commented Jan 3, 2023

Thanks for the pull request, @pkulkark!

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

@pkulkark pkulkark force-pushed the pooja/unify-xblock-naming-descriptor branch 2 times, most recently from e990fae to 3b0d4d8 Compare January 9, 2023 21:12
@pkulkark pkulkark changed the title [WIP][BD-13][BB-6927] Unify xblock naming descriptor [BD-13][BB-6927] Unify xblock naming descriptor Jan 9, 2023
@pkulkark pkulkark force-pushed the pooja/unify-xblock-naming-descriptor branch 2 times, most recently from da81b5f to 1eced71 Compare January 10, 2023 16:24
@pkulkark pkulkark force-pushed the pooja/unify-xblock-naming-descriptor branch 3 times, most recently from 8bf474c to 1be8649 Compare January 27, 2023 15:01
@pkulkark pkulkark force-pushed the pooja/unify-xblock-naming-descriptor branch 3 times, most recently from a54a149 to aa81a75 Compare March 22, 2023 15:30
@Agrendalath Agrendalath force-pushed the pooja/unify-xblock-naming-descriptor branch from aa81a75 to 3d8ee15 Compare April 3, 2023 16:33
@e0d
Copy link
Contributor

e0d commented Apr 14, 2023

@Agrendalath is the plan to rebase this after #31472 is released or would there be value in doing so now?

I notice there are some failing unit tests, not sure if that will be addressed by the rebase.

@Agrendalath
Copy link
Member

@e0d, both PRs change lots of files, so each rebase on #31472 is complex and time-consuming. We need to keep #31472 up-to-date because it is possible that changes introduced to edx-platform in the meantime (i.e. before we merge it) will be incompatible, despite not causing merge conflicts (example: 522c48c). Therefore, to reduce the maintenance, it makes more sense to rebase it after #31472 is merged.

I notice there are some failing unit tests, not sure if that will be addressed by the rebase.

Yes, these should be gone after the final rebase.

@Agrendalath
Copy link
Member

@ormsbee, I plan to finish my last pass of review and fixes tomorrow. Most of the diffs are trivial, so to simplify things I would like to get your opinion on changes in the following files:

  1. lms/djangoapps/courseware/block_render.py
  2. lms/djangoapps/courseware/model_data.py
  3. xmodule/modulestore/split_mongo/split.py

If you would also be able to review a small refactor in openedx/completion#231 (related to this PR), it would be perfect.

Copy link
Member

@Agrendalath Agrendalath left a comment

Choose a reason for hiding this comment

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

👍

  • I tested this: did regression checks locally
  • I read through the code
  • I checked for accessibility issues: n/a
  • Includes documentation: n/a
  • I made sure any change in configuration variables is reflected in the corresponding client's configuration-secure repository: n/a

@Agrendalath
Copy link
Member

Agrendalath commented Apr 26, 2023

@e0d, this is good to go from my end. We'll need somebody to review a trivial change in openedx/completion#231 to support these changes. If you'd like, I can find a CC to do it next sprint.

Edit: I'll autosquash the commits before merging this.

Copy link
Contributor

@ormsbee ormsbee left a comment

Choose a reason for hiding this comment

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

@Agrendalath: I reviewed the changes in the files you mentioned, and that looks good to me. Also reviewed and merged completion API PR.

@Agrendalath
Copy link
Member

Thank you, @ormsbee! If you could create a release from the tag for the completion PR, that would be all we need to merge this and close this project.

@ormsbee
Copy link
Contributor

ormsbee commented Apr 26, 2023

Weird, I did tag it, but I don't see it properly showing up on PyPI. I wonder if I messed that up somehow? I'll take a look.

@kdmccormick
Copy link
Member

@ormsbee the release workflow triggers on publish so you will need to use the GH releases UI rather than just creating a tag. Fortunately, you can make a GH release from an existing tag.

@ormsbee
Copy link
Contributor

ormsbee commented Apr 26, 2023

Thanks @kdmccormick!

@Agrendalath Agrendalath force-pushed the pooja/unify-xblock-naming-descriptor branch from 808f867 to bc0f796 Compare April 26, 2023 15:10
pkulkark and others added 16 commits April 26, 2023 17:10
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Agrendalath <piotr@surowiec.it>
…_task

Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Agrendalath <piotr@surowiec.it>
@Agrendalath Agrendalath force-pushed the pooja/unify-xblock-naming-descriptor branch from bc0f796 to e1fb866 Compare April 26, 2023 15:11
@jristau1984 jristau1984 merged commit 4afb210 into openedx:master Apr 26, 2023
@Agrendalath Agrendalath deleted the pooja/unify-xblock-naming-descriptor branch April 26, 2023 16:17
@edx-pipeline-bot
Copy link
Contributor

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

@edx-pipeline-bot
Copy link
Contributor

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

1 similar comment
@edx-pipeline-bot
Copy link
Contributor

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

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

Labels

blended PR is managed through 2U's blended developmnt program

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

8 participants