Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Carlos muniz/symmath removal unrevert #29912

Merged
merged 3 commits into from
Feb 14, 2022
Merged

Carlos muniz/symmath removal unrevert #29912

merged 3 commits into from
Feb 14, 2022

Conversation

Carlos-Muniz
Copy link
Contributor

@Carlos-Muniz Carlos-Muniz commented Feb 11, 2022 •
edited
Loading

Description

This PR un-reverts #29909 and adds a fix to the issue that broke the edxapp build on GoCD.

Testing Instructions

The code has been tested:

  • Manually:
    • A custom dev image of lms/cms was built using this branch via tutor
    • Tutor was started in dev mode using these images
    • While these containers were running, the version of openedx-calc was checked to be 3.0.1, and that symmath was not in common/lib/
    • In the CMS GUI (Studio), a new course was formed, and a new symbolic math problem was initiated.
    • Answers that were mathematically correct, but symbolically different were entered into the sample problem
  • Locally: Pytest via Tutor
  • Online: All checks have passed

Other information

For more information see #29909 and #29869

@Carlos-Muniz Carlos-Muniz self-assigned this Feb 11, 2022
@Carlos-Muniz Carlos-Muniz marked this pull request as ready for review February 11, 2022 19:16
@kdmccormick
Copy link
Member

@Carlos-Muniz if you run make upgrade again, does the - e come back?

@kdmccormick
Copy link
Member

pro tip @Carlos-Muniz : if you don't want to run make upgrade locally, you can go to Actions > Upgrade Requirements and run the action against your brach, which'll open a new PR with the results.

kdmccormick
kdmccormick approved these changes Feb 14, 2022
View reviewed changes
Copy link
Member

@kdmccormick kdmccormick left a comment

Choose a reason for hiding this comment

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

:shipit: :shipit: :shipit: :shipit: :shipit:

Carlos Muniz added 3 commits February 14, 2022 10:09
Revert "Merge pull request #29909 from openedx/revert-29869-Carlos-Mu…
cf82407 
…niz/symmath-removal"

This reverts commit 8c0db8d, reversing
changes made to 1156c62.
fix: Remove misplaced -e
a3b3380 
`-e` was wrongfully placed in front of `common/lib/sandbox-packages`,
which may have most likely been causing the edxAPP to break.
fix: Change regex to apply to right dirs
19c2999 
`py38.txt` does not include `common/lib/xmodule` so it doesn't match the
regex. Therefor, it never got its lines in `common/lib/sandbox-packages`
fixed. If we change the regex to match any `common/lib/<packagename>` it
should work correctly.
@Carlos-Muniz Carlos-Muniz force-pushed the Carlos-Muniz/symmath-removal-unrevert branch from 7d0a9ca to 19c2999 Compare February 14, 2022 15:09
@Carlos-Muniz Carlos-Muniz merged commit 8e8d840 into master Feb 14, 2022
@Carlos-Muniz Carlos-Muniz deleted the Carlos-Muniz/symmath-removal-unrevert branch February 14, 2022 15:26
@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.

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

@kdmccormick kdmccormick kdmccormick approved these changes

Assignees

@Carlos-Muniz Carlos-Muniz

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Carlos-Muniz @kdmccormick @edx-pipeline-bot