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.

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

Updates problem-builder version to match master #13641

Merged

Conversation

pomegranited
Copy link
Contributor

@pomegranited pomegranited commented Oct 4, 2016

Desired Deployment Date: 2016-10-21

Client: DavidsonX

Updates the problem-builder version deployed on edX to add features provided from the master branch.

Dependencies: open-craft/problem-builder#119

Sandbox URL:

Problem Builder - v2.6.0

Partner information: Hosted on edx.org (Davidson College)

Merge deadline: 27 Oct 2016

Testing instructions:

  1. Login to the sandbox LMS as a student.
  2. Register for the Problem Builder Demo Course.
  3. To test the new Step Builder XBlock, see Introduction > Overview > Step Builder.
  4. To test the new Plot XBlock, see Features > Plot.
  5. To test the new Ranged Value Slider XBlock, see Features > Plot > Question 2.
  6. To test the Question-level and Choice-level feedback changes, see Features > MCQ/MRQ Feedback.
  7. To test the Problem Builder (deprecated assessment mode), see Features > Assessment Mode > Problem Builder - Assessment Mode (deprecated).
  8. To test the Step Builder (implicit assessment mode), see Features > Assessment Mode > Step Builder - Assessment Mode (implicit).
  9. To test the Dashboard, see Features > Dashboard.
  10. To test the Instructor Tool, see Features > Instructor Tool.

To test specific changes, see the PR descriptions from open-craft/problem-builder#119.

And for more documentation on how to use Problem Builder, see: https://github.com/open-craft/problem-builder/tree/master/doc

Author notes and concerns:

See the Issues list on PR 119.

Reviewers

Settings

EDXAPP_EXTRA_REQUIREMENTS:
  - name: git+https://github.com/open-craft/[email protected]#egg=problem-builder=v2.6.0

@openedx-webhooks
Copy link

Thanks for the pull request, @pomegranited! It looks like you're a member of a company that does contract work for edX. If you're doing this work as part of a paid contract with edX, you should talk to edX about who will review this pull request. If this work is not part of a paid contract with edX, then you should ensure that there is an OSPR issue to track this work in JIRA, so that we don't lose track of your pull request.

To automatically create an OSPR issue for this pull request, just visit this link: https://openedx-webhooks.herokuapp.com/github/process_pr?number=13641&repo=edx%2Fedx-platform

@pomegranited
Copy link
Contributor Author

jenkins run lettuce

@openedx-webhooks
Copy link

Thanks for the pull request, @pomegranited! I've created OSPR-1491 to keep track of it in JIRA. JIRA is a place for product owners to prioritize feature reviews by the engineering development teams.

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

  • supporting documentation
  • edx-code email 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 still be done via the GitHub pull request interface. As a reminder, our process documentation is here.

@openedx-webhooks openedx-webhooks added needs triage open-source-contribution PR author is not from Axim or 2U product review PR requires product review before merging awaiting prioritization and removed needs triage product review PR requires product review before merging labels Oct 4, 2016
@pomegranited
Copy link
Contributor Author

@gsong This is the edx-platform update that relates to open-craft/problem-builder#119.

Once that PR is merged, I'll update this PR to link to the specific commit hash, instead of just referencing the edx-release branch name.

@gsong
Copy link
Contributor

gsong commented Oct 8, 2016

@pomegranited Yup. I've pushed this PR to the queue for engineering review and will follow up next week. Product managers have said they don't need to review functionality as long as you've confirmed with the partner that it satisfies their needs, which @antoviaque did.

@openedx-webhooks openedx-webhooks added engineering review waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. and removed awaiting prioritization engineering review waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. labels Oct 24, 2016
@dianakhuang
Copy link
Contributor

👍 from me on the updated version.

@shaunagm
Copy link
Contributor

shaunagm commented Nov 1, 2016

@dianakhuang is there anyone else who needs to review, or can we merge? Our goal was to get this merged by end of Oct, so we're already a bit behind schedule.

Thank you for your work on this, regardless! This is one of the larger PRs that's ever come through the OSPR process, I believe.

@dianakhuang
Copy link
Contributor

@shaunagm I believe that I am the last reviewer needed. I am happy to merge once @pomegranited says that everything is set on the problem-builder end of things.

@pomegranited pomegranited force-pushed the jill/problem-builder-edx-release branch from e8796f4 to 6536f84 Compare November 1, 2016 23:39
@pomegranited
Copy link
Contributor Author

Thank you, @dianakhuang and @shaunagm ! This has been a monumental PR, indeed. Hopefully future updates for this xblock won't be so huge 😄

I've bumped the version for Problem Builder to v2.6.0, and updated the sandbox to use the new tag.

Merge when ready!

@pomegranited
Copy link
Contributor Author

pomegranited commented Nov 2, 2016

Sorry.. just rebasing to see if it resolves those jenkins python errors.

@pomegranited pomegranited force-pushed the jill/problem-builder-edx-release branch from 6536f84 to d6787cd Compare November 2, 2016 00:33
@dianakhuang dianakhuang merged commit 464ab1a into openedx:master Nov 2, 2016
@jibsheet
Copy link
Contributor

jibsheet commented Nov 2, 2016

@pomegranited @bradenmacdonald This breaks builds of edx-platform and CI because your tags are of the form v2.6.0 not 2.6.0

A simple pip install -r requirements/edx/edx-private.txt shows the problem.

Collecting xblock-problem-builder==2.6.0 from git+https://github.com/open-craft/[email protected]#egg=xblock-problem-builder==2.6.0 (from -r requirements/edx/edx-private.txt (line 11))
  Cloning https://github.com/open-craft/problem-builder.git (to 2.6.0) to /private/var/folders/0j/z29x1jvx6gb_qv84qfl8rzqh0000gp/T/pip-build-quKsvd/xblock-problem-builder
  Could not find a tag or branch '2.6.0', assuming commit.
error: pathspec '2.6.0' did not match any file(s) known to git.
  Complete output from command git checkout -q 2.6.0:


$ git tag -l | grep 2.6.0
v2.6.0

This will not fail tests, because we do not test edx-private.txt

@cahrens
Copy link

cahrens commented Nov 2, 2016

@pomegranited It would be good to understand why the sandbox did not catch this problem.

@jibsheet
Copy link
Contributor

jibsheet commented Nov 2, 2016

@cahrens my guess is that the sandbox was based off a -e with the git hash in it and only at the end was it switched to a tag based version string, but we'd have to go back and look at the deployed code.

@pomegranited
Copy link
Contributor Author

@cahrens @jibsheet Yes, I deployed the code to our sandbox with a -e flag, and just updated the deployed code without re-creating the sandbox. I will be more careful next time.

@bradenmacdonald bradenmacdonald deleted the jill/problem-builder-edx-release branch November 3, 2016 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
engineering review open-source-contribution PR author is not from Axim or 2U
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants