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

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

Merged
merged 2 commits into from
Oct 4, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 4, 2022

This is an automatic backport of pull request #4263 done by Mergify.
Cherry-pick of 026d614 has failed:

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

You are currently cherry-picking commit 026d6144.
  (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/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
	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

…4234) (#4263)

* fix(typing): update types to be compatible with latest mypy (#4234)

* 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)

* ci(mypy): remove type callable ignores (backport #4253) (#4258)

* Remove ignores for updated mypy (#4253)

Mypy==0.982 has just been released and fixed the inherent type/callable type hinting that was the problem from #4234. As a result, the type ignore comments added in #4234 to bypass the type/callable issue are not unneeded and are breaking CI.

(cherry picked from commit 0ba3e29)

# Conflicts:
#	ddtrace/profiling/collector/memalloc.py
#	ddtrace/profiling/exporter/http.py

* fix conflicts

Co-authored-by: Yun Kim <35776586+Yun-Kim@users.noreply.github.com>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
Co-authored-by: Munir Abdinur <munir_abdinur@hotmail.com>

Co-authored-by: Yun Kim <35776586+Yun-Kim@users.noreply.github.com>
Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
Co-authored-by: Munir Abdinur <munir_abdinur@hotmail.com>
(cherry picked from commit 026d614)

# Conflicts:
#	ddtrace/debugging/_debugger.py
#	ddtrace/internal/utils/cache.py
#	ddtrace/profiling/collector/asyncio.py
ddtrace/profiling/collector/asyncio.py Outdated Show resolved Hide resolved
ddtrace/debugging/_debugger.py Outdated Show resolved Hide resolved
@Yun-Kim Yun-Kim added the changelog/no-changelog A changelog entry is not required for this PR. label Oct 4, 2022
@brettlangdon brettlangdon merged commit 9682c70 into 0.61 Oct 4, 2022
@brettlangdon brettlangdon deleted the mergify/bp/0.61/pr-4263 branch October 4, 2022 16:12
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.

3 participants