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

Drop mock dependency #6723

Merged
merged 4 commits into from Mar 5, 2020
Merged

Drop mock dependency #6723

merged 4 commits into from Mar 5, 2020

Conversation

GallowayJ
Copy link
Contributor

@GallowayJ GallowayJ commented Feb 28, 2020

Dropped mock as a dependency to resolve issue #6665 by changing imports of mock to unittest.mock and removing mock from requirements.txt.

CHANGELOG.rst Outdated
@@ -8,6 +8,7 @@ This version has two major changes:
* It updates our default docker images to stable=5.0 and latest=6.0.
* It changes our PR builder domain to `readthedocs.build`

* `@gallowayj <https://github.com/gallowayj>`__: Drop mock as a dependency (`#6665 <https://github.com/readthedocs/readthedocs.org/pull/6665>`__)
Copy link
Member

@saadmk11 saadmk11 Feb 28, 2020

Choose a reason for hiding this comment

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

This is actually auto generated. So, I think we don't need to add this here.

Copy link
Contributor Author

@GallowayJ GallowayJ Feb 28, 2020

Choose a reason for hiding this comment

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

@saadmk11 Sorry, should I cancel the pull requestion and resubmit a new pull request with the changes add to CHANGELOG.rst?

Copy link
Member

@saadmk11 saadmk11 Feb 28, 2020

Choose a reason for hiding this comment

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

No. Just remove this line and push it to the branch and the PR will be updated

Copy link
Contributor Author

@GallowayJ GallowayJ Feb 28, 2020

Choose a reason for hiding this comment

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

@saadmk11 Thanks, I've removed that line and pushed the changes back to the branch.

Copy link
Member

@saadmk11 saadmk11 left a comment

Thank you for the PR. 💥

stsewd
stsewd approved these changes Mar 4, 2020
Copy link
Member

@stsewd stsewd left a comment

Thanks!

@stsewd stsewd merged commit 009789b into readthedocs:master Mar 5, 2020
2 checks passed
@stsewd stsewd mentioned this pull request Mar 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants