Status of devel

47 views
Skip to first unread message

Edward K. Ream

unread,
Jul 10, 2021, 5:31:58 AM7/10/21
to leo-editor
Early this morning I merged the ekr-annotate branch into devel. See PR #1948 for details.

The ekr-annotate branch only added mypy type annotations and two new stub files. However, the branch changed/added 57 files, some in many places. I carefully reviewed all diffs, but this was a nerve-wracking business :-) I wanted to do the merge asap, so there will be plenty of time for testing before Leo 6.4 b1.

This should be the last major change to Leo's code base before Leo 6.4 final. All upcoming PR's will be much smaller.

Edward

tbp1...@gmail.com

unread,
Jul 10, 2021, 9:41:22 AM7/10/21
to leo-editor
This morning's change set doesn't run under PyQt6.11.  The problem is with the new Qt6 enumerations:

 File "c:\Tom\git\leo-editor\leo\plugins\nested_splitter.py", line 363, in NestedSplitter
    Orientations = QtCore.Qt.Orientations if isQt6 else QtCore.Qt
AttributeError: type object 'Qt' has no attribute 'Orientations'

Under PyQt6.02, Leo runs but VR3 dies at load because of an as-yet unimplemented QT widget:

 File "c:\Tom\git\leo-editor\leo\plugins\viewrendered3.py", line 714, in <module>
    QSvgWidget = QtSvg.QSvgWidget

AttributeError: 'NoneType' object has no attribute 'QSvgWidget'

I will fix this last problem - it will make the SVG capability unavailable, as well as the ability to render any node body starting with "<" as literal html or xml.

Otherwise, the new clickable Find results worked as desired ... Yay!  Tested on:

Leo 6.4-devel, devel branch, build 3cf1cbc41b
2021-07-10 07:55:26 -0500
Python 3.9.5, PyQt version 5.15.2
Windows 10 AMD64 (build 10.0.19043)

tbp1...@gmail.com

unread,
Jul 10, 2021, 11:10:55 AM7/10/21
to leo-editor
Created PR  #2045 to fix VR3 not finding QSvg widget.

Zoom.Quiet

unread,
Jul 10, 2021, 9:14:18 PM7/10/21
to leo-e...@googlegroups.com
Edward K. Ream <edre...@gmail.com> 于2021年7月10日周六 下午5:32写道:
>
> Early this morning I merged the ekr-annotate branch into devel. See PR #1948 for details.
>
> The ekr-annotate branch only added mypy type annotations and two new stub files. However, the branch changed/added 57 files, some in many places. I carefully reviewed all diffs, but this was a nerve-wracking business :-) I wanted to do the merge asap, so there will be plenty of time for testing before Leo 6.4 b1.
>

mypy? so cool,
merge this will make Leo more speed?
and will change run env.?


> This should be the last major change to Leo's code base before Leo 6.4 final. All upcoming PR's will be much smaller.
>
> Edward
>
> --
> You received this message because you are subscribed to the Google Groups "leo-editor" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to leo-editor+...@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/c3b1db8a-6c1a-4245-b360-0e5b9e4b26c7n%40googlegroups.com.



--
----------------
life is pathetic, go Pythonic. 人生苦短, Python当歌 ;-)
课: https://py.101.camp/
怼: https://du.101.camp/
俺: http://zoomquiet.io
许: http://creativecommons.org/licenses/by-sa/2.5/cn/
怒: 冗余不做,日子甭过!备份不做,十恶不赦.
KM keep growing environment culture which promoting organization learning ;-)

Edward K. Ream

unread,
Jul 11, 2021, 2:27:03 AM7/11/21
to leo-editor
On Sat, Jul 10, 2021 at 8:14 PM Zoom.Quiet <zoom....@gmail.com> wrote:

mypy? so cool,
merge this will make Leo more speed?

No. mypy annotations are like comments. They only help mypy check types.
and will change run env.?

No. Nothing will change. mypy is like pylint.

Hehe. The only thing that will change is that there will be one less project for me to think about.

Edward

Zoom.Quiet

unread,
Jul 11, 2021, 3:58:45 AM7/11/21
to leo-e...@googlegroups.com
Edward K. Ream <edre...@gmail.com> 于2021年7月11日周日 下午2:27写道:
COOL,
new toy ;-)
if real want speed Leo,
base PyPy is easy.

> Edward
>
> --
> You received this message because you are subscribed to the Google Groups "leo-editor" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to leo-editor+...@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/CAMF8tS2_6P%3Dqnc1Fn2tTozrW5wGT4CscETD0D4t-c24fD2%2BVAg%40mail.gmail.com.

Edward K. Ream

unread,
Jul 11, 2021, 7:05:29 AM7/11/21
to leo-editor
On Sun, Jul 11, 2021 at 2:58 AM Zoom.Quiet <zoom....@gmail.com> wrote:

COOL,
new toy ;-)

Yes. The toy has confirmed that (for Leo) I do know the types of most vars and arguments, especially c, g and p :-) That's an important fact, imo.
if real want speed Leo,
base PyPy is easy.

That's a project for another year :-) I'm happy with all aspects of Leo's speed.

As a thought experiment, Leo in rust is something to consider. Rust makes clear that the lifetime of objects is not always intuitive. Imo, rust is fundamentally important.

I recently wrote that Leo is basically a static program written in a dynamic language. That's true, I think, of most programs. That doesn't mean that dynamic languages are worse than dynamic languages.  Not at all. I love the freedom and safety that python gives me.

Edward
Reply all
Reply to author
Forward
0 new messages