Merge conflict #55
Closed
Merge conflict #55
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
…ster Merge remote-tracking branch '6.0/stage' into 'master'
The "pre-commit-hooks" repo contains a few hooks that enforce some nice, common sense guidelines. The "vermin" hook checks compatibility with a supplied minimum Python version requirement, both checking the syntax and standard library usage. It's very helpful for identifying incompatible code before getting to the CI steps. Rather than repeatedly excluding the contrib directory, set it to be excluded at the top-level. Signed-off-by: Stephen Brennan <[email protected]>
ptpython is a really excellent REPL library which provides great multiline history and editing support, as well as syntax highlighting, and a nice code completion UI. Signed-off-by: Stephen Brennan <[email protected]>
Completion of drgn Objects *is* already possible in ptpython, but unfortunately the list of completions is alphabetical (except for underscored attributes, which are last). This means that default Object fields like "absent_" and "type_" are not distinguished from the Object member fields. Resolve this by detecting when the first completion is "absent_" and then moving all the non-default completions to the beginning of the list. The result is that Object members are enumerated first, followed by the default Object fields. Signed-off-by: Stephen Brennan <[email protected]>
The only error is about typing.Literal, which we already have guarded in a sys.version_info check, so we can add novermin. Signed-off-by: Omar Sandoval <[email protected]>
Read the Docs is going to require build.os and build.tools.python to be configured [1]. It also looks like the recommended configuration filename is .readthedocs.yaml instead of .readthedocs.yml. Fix both. 1: https://blog.readthedocs.com/use-build-os-config/ Signed-off-by: Omar Sandoval <[email protected]>
The error message from Read the Docs says: "Problem in your project's configuration. Invalid configuration option "build.tools.python": expected one of (2.7, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3, miniconda3-4.7, mambaforge-4.10, mambaforge-22.9), got 3". Maybe it got a number and expects a string. Signed-off-by: Omar Sandoval <[email protected]>
UBSan reported "runtime error: null pointer passed as argument 1, which is declared to never be null" for the call to qsort() in drgn_dwarf_info_update_index(). This is somewhat similar to what I fixed in commits a17215e ("libdrgn: dwarf_index: fix memcpy() undefined behavior") and 968abed ("libdrgn: dwarf_info: fix memcpy() undefined behavior (again)"). It can only happen if there are no CUs to index, so check for that. Signed-off-by: Omar Sandoval <[email protected]>
Signed-off-by: Omar Sandoval <[email protected]>
sdimitro
approved these changes
Sep 11, 2023
sebroy
approved these changes
Sep 11, 2023
|
This was resolved by #56 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I deleted this file from our repo.