Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 10, 2022

This is an automatic backport of pull request #3241 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Correct import to not reference `__init__`

This will otherwise bring up the following error from mypy when type checking a
code base that import ddtrace:

> Source file found twice under different module names:
> "ddtrace.internal.utils" and "ddtrace.internal.utils.__init__"

This error didn't occur with version 0.57.3 but did with 0.58.0.

* Add entry for release notes

* Update releasenotes/notes/fix-utils-import-c0f574d76de77261.yaml

Co-authored-by: Brett Langdon <me@brett.is>
Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
(cherry picked from commit 8be9e2a)
@mergify mergify bot requested a review from a team as a code owner February 10, 2022 15:24
@brettlangdon brettlangdon merged commit 684aa0f into 0.58 Feb 10, 2022
@brettlangdon brettlangdon deleted the mergify/bp/0.58/pr-3241 branch February 10, 2022 15:30
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.

3 participants