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

Upgrade the ddt package to a version supports Python 3 #18837

Merged
merged 1 commit into from Sep 10, 2018
Merged

Upgrade the ddt package to a version supports Python 3 #18837

merged 1 commit into from Sep 10, 2018

Conversation

shadinaif
Copy link
Contributor

@shadinaif shadinaif commented Aug 26, 2018

Upgrade the ddt package from the old version 0.8.0 to the latest version that supports Python3 (version 1.2.0 as of this commit).

This commit is intended to close INCR-6 issue (see https://openedx.atlassian.net/browse/INCR-6 )

This will update requirements file base.in to remove the version restriction. It will also update few lines of code affected by the ddt upgrade

@openedx-webhooks
Copy link

Thanks for the pull request, @shadinaif! I've created OSPR-2566 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 labels Aug 26, 2018
@shadinaif shadinaif changed the title This is to upgrade the ddt package from the old 0.8.0 version to the … Upgrade the ddt package to a version supports Python 3 Aug 27, 2018
@shadinaif
Copy link
Contributor Author

@OmarIthawi would you please take a look into this?

@OmarIthawi
Copy link
Member

Sure, thanks @shadinaif! Will take a look in the next few days.

@OmarIthawi
Copy link
Member

OmarIthawi commented Sep 2, 2018

@mduboseedx Hi! I'm trying to review this PR but it seems that Jenkins isn't running the tests.

Do you mind white-listing @shadinaif's contributions?

cc: @jmbowman I think this is one of the INCR issues that you've suggested. I'm doing an initial review. If you're interested to review it, perhaps we could skip the usual review pipeline?

Copy link
Member

@OmarIthawi OmarIthawi left a comment

Choose a reason for hiding this comment

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

👍 Looks good to me. Thanks @shadinaif!

I've tested the following:

  • Tests run as expected, for anything uses @file_data ($ git grep -e @file_data -A2 -- '*.py')
  • Code quality looks good to me
  • Need Jenkins to run.
  • Should rebase the branch to resolve conflicts

common/djangoapps/util/tests/test_keyword_sub_utils.py Outdated Show resolved Hide resolved
requirements/edx/base.in Outdated Show resolved Hide resolved
@OmarIthawi
Copy link
Member

@shadinaif it appears that there are conflicts with your branch. Here's how to fix them:

  1. Update your master branch
  2. Checkout your branch ddt-upgrade-INCR-6
  3. Rebase on master, resolve the conflicts according to what's in master
  4. Re-run the upgrade requirements command
  5. Push the changes (you'll need a push --force)

@shadinaif
Copy link
Contributor Author

Thank you very much @OmarIthawi

@shadinaif
Copy link
Contributor Author

all done dear @OmarIthawi :bowtie:

Copy link
Member

@OmarIthawi OmarIthawi left a comment

Choose a reason for hiding this comment

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

Great work. Thanks @shadinaif!

Approving, as Iv'e tested the following:

  • Tests run as expected, for anything uses @file_data ($ git grep -e @file_data -A2 -- '*.py')
  • Code quality looks good to me
  • The branch is rebased and the conflicts are resolved
  • Jenkins tests are passing

@shadinaif
Copy link
Contributor Author

Hello @mduboseedx , @nedbat ; would you please authorize my PR for Jenkins ? this is a simple PR for an upgrade suggested by your team ↗️

@mduboseedx
Copy link
Contributor

jenkins ok to test

@mduboseedx
Copy link
Contributor

@shadinaif Sorry for the delay on this PR. Our entire Open Source team was out of town last week, but the tests should now be running.

@shadinaif
Copy link
Contributor Author

Thanks a lot @mduboseedx and @OmarIthawi

@mduboseedx
Copy link
Contributor

@jmbowman This PR is for https://openedx.atlassian.net/browse/INCR-6. Could you give this a look over?

requirements/edx/base.in Outdated Show resolved Hide resolved
@shadinaif
Copy link
Contributor Author

@nedbat ; maybe jenkins needs to run the test again after the last commit

@shadinaif
Copy link
Contributor Author

Ohhh it is required for sure to run the test again (not a maybe)

@OmarIthawi
Copy link
Member

@shadinaif you can use this command jenkins run python to force a rerun.

Anyway, Jenkins will run on every git push.

@nedbat
Copy link
Contributor

nedbat commented Sep 6, 2018

@shadinaif About the version of pytest-cov: I'm trying a fix for the latest version in this pull request: https://github.com/edx/edx-platform/pull/18880

@nedbat
Copy link
Contributor

nedbat commented Sep 6, 2018

@shadinaif It looks like we can't use pytest-cov 2.6.0 yet. To make progress on this pull request, I guess you should pin it to 2.5.1.

@jmbowman pytest-cov 2.6.0 produces failures in HTML report, "no data to report." Seems related to pytest-dev/pytest-cov#222

@shadinaif
Copy link
Contributor Author

@nedbat I can see your still working on this issue in #18880

I have set the pin on pytest-cov==2.5.1 here, and restored the pin for coverage==4.2. But I will wait for your advice after your done with your PR; Good luck 👍

requirements/edx/testing.in Outdated Show resolved Hide resolved
Copy link
Member

@OmarIthawi OmarIthawi left a comment

Choose a reason for hiding this comment

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

Removing the stale review. The PR now is a bit different. Will take another look if needed.

Copy link
Member

@OmarIthawi OmarIthawi left a comment

Choose a reason for hiding this comment

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

@shadinaif Could you please resolve the conflicts in testing.in?

Removing the stale review. The PR now is a bit different. Will take another look if needed.

@shadinaif
Copy link
Contributor Author

@nedbat I couldn't add the comment as requested. There were a conflict with https://github.com/edx/edx-platform/pull/18879

…latest version that supports Python3

(version 1.2.0 as of this commit)

This commit is intended to close INCR-6 issue (see https://openedx.atlassian.net/browse/INCR-6 )
@shadinaif
Copy link
Contributor Author

jenkins run bokchoy

@edx-status-bot
Copy link

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

@nedbat
Copy link
Contributor

nedbat commented Sep 10, 2018

@shadinaif Looks like the pytest-cov situation has been taken care of, though I wish the other developer had left a comment!

I'll merge this now.

@nedbat nedbat merged commit 45a0b54 into openedx:master Sep 10, 2018
@openedx-webhooks
Copy link

@shadinaif 🎉 Your pull request was merged!

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

@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 on Tuesday, September 11, 2018.

@edx-pipeline-bot
Copy link
Contributor

EdX Release Notice: This PR may have caused e2e tests to fail on Stage. E2E tests have failed. https://gocd.tools.edx.org/go/tab/pipeline/history/STAGE_edxapp_M-D

@edx-pipeline-bot
Copy link
Contributor

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

@shadinaif
Copy link
Contributor Author

Thank you all 😃

@shadinaif shadinaif deleted the ddt-upgrade-INCR-6 branch September 12, 2018 07:05
@shadinaif
Copy link
Contributor Author

shadinaif commented Sep 12, 2018

@nedbat ; please be informed that the following tests will fail until the docker image is updated (developers must run make requirements to pass over this problem)
common/djangoapps/util/tests/test_keyword_sub_utils.py
pavelib/paver_tests/test_paver_quality.py

@jmbowman
Copy link
Contributor

Catching up on notifications from while I was out on vacation; I've closed INCR-6 now that this has been merged, and created TE-2733 to fix the issue behind the original comment regarding ddt being present in the base edx-platform dependencies.

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.

None yet

8 participants