-
Notifications
You must be signed in to change notification settings - Fork 799
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
Bumped Scintilla from 1.77 to 4.4.6 #2425
Bumped Scintilla from 1.77 to 4.4.6 #2425
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this seems great, thanks! I'm a bit confused by the non-vendoring changes though?
pyrightconfig.json
Outdated
@@ -6,6 +6,7 @@ | |||
"enableTypeIgnoreComments": true, | |||
// Exclude from scanning when running pyright | |||
"exclude": [ | |||
".git/", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's this for? Can we ignore `.*? Or can we not have pyright or something, how could it possibly get confused in this way?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Git stores branch names as files on disc
Some branch names end in .py
pyright tries to scan them as python files and fails
This only affects local development because the CI doesn't fetch all branches. It's also already on main so it'll disappear from this PR after I resolve the conflict.
Doesn't affect mypy because it always ignores .git.
It would affect Ruff if the config used exclude
instead of extend-exclude
setup.py
Outdated
@@ -926,7 +926,7 @@ class my_compiler(MSVCCompiler): | |||
# worse! This can probably go away once we kill the VS project files | |||
# though, as we can just specify the lowercase name in the module def. | |||
_cpp_extensions = MSVCCompiler._cpp_extensions + [".CPP"] | |||
src_extensions = MSVCCompiler.src_extensions + [".CPP"] | |||
src_extensions = MSVCCompiler.src_extensions + [".CPP"] # type: ignore[operator] # TODO: Fix in typeshed |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this a future todo to yourself or something?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This TODO is resolved ! python/typeshed#12995
And ironically, obsoleted by #2409 which just removed the line
…Scintilla-from-1.77-to-4.4.6
This started as a curiosity, the update was really easy and seems to be working as-is from a sanity check of Pythonwin. (I still need to run all the Demos from
Pythonwin/pywin/Demos/guidemo.py
)Get 12 years of improvements and bugfixes from Scintilla.
4.4.6 is the last version of Scintilla before Lexilla got split into its own project. See:
Lexers got moved from
scintilla/src
toscintilla/lexers
+scintilla/lexlib
in 2.20