Skip to content

fix(typing): update types to be compatible with latest mypy (backport #4234) - #4265

Closed
mergify[bot] wants to merge 1 commit into
0.61from
mergify/bp/0.61/pr-4234
Closed

mergify[bot] wants to merge 1 commit into
0.61from
mergify/bp/0.61/pr-4234

Conversation

@mergify

@mergify mergify Bot commented Oct 3, 2022

Copy link
Copy Markdown
Contributor

This is an automatic backport of pull request #4234 done by Mergify.
Cherry-pick of 5140de4 has failed:

On branch mergify/bp/0.61/pr-4234
Your branch is up to date with 'origin/0.61'.

You are currently cherry-picking commit 5140de46.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   ddtrace/internal/atexit.py
	modified:   ddtrace/internal/runtime/runtime_metrics.py
	modified:   ddtrace/internal/writer.py
	modified:   ddtrace/profiling/collector/_lock.py
	modified:   ddtrace/profiling/collector/memalloc.py
	modified:   ddtrace/profiling/exporter/http.py
	modified:   ddtrace/profiling/profiler.py
	modified:   ddtrace/profiling/scheduler.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ddtrace/debugging/_debugger.py
	both modified:   ddtrace/internal/utils/cache.py
	both modified:   ddtrace/profiling/collector/__init__.py
	deleted by us:   ddtrace/profiling/collector/asyncio.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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

* Initial mypy fixes for CI

* Ignored mypy error with type and type constructors

* Fix formatting

* Fixed incorrect typing

* Undo initial change

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
(cherry picked from commit 5140de4)

# Conflicts:
#	ddtrace/debugging/_debugger.py
#	ddtrace/internal/utils/cache.py
#	ddtrace/profiling/collector/__init__.py
#	ddtrace/profiling/collector/asyncio.py
@mergify
mergify Bot requested a review from a team as a code owner October 3, 2022 21:23
@mergify mergify Bot added the conflicts label Oct 3, 2022
@mergify mergify Bot removed the conflicts label Oct 3, 2022
@Yun-Kim Yun-Kim added the changelog/no-changelog A changelog entry is not required for this PR. label Oct 3, 2022
@mabdinur mabdinur closed this Oct 4, 2022
@mergify
mergify Bot deleted the mergify/bp/0.61/pr-4234 branch October 4, 2022 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog/no-changelog A changelog entry is not required for this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants