search

nucleic / enaml

Declarative User Interfaces for Python
http://enaml.readthedocs.io/en/latest/
Other
1.53k stars 130 forks source link

Update scintilla for Qt6 #484

Closed frmdstryr closed 2 years ago

frmdstryr commented 2 years ago

Builds on #475. It seems like PyQt6 changes how enums values are exposed.

One fix in q_icon_widget that may need addressed https://doc-snapshots.qt.io/qt6-dev/qlayout.html#getContentsMargins seems to have moved from QWidget.

MatthieuDartiailh commented 2 years ago

Looks great, I am just bothered by the fact that running the example in CI did not catch any of those issues. How did you catch them ?

frmdstryr commented 2 years ago

These were found by running DeclaraCAD.

It doesn't look like CI is running the live editor on Qt6?

MatthieuDartiailh commented 2 years ago

Indeed looks like I messed up the CI config. Could you replace the following snippet by the next one in ci.yml ?

 - name: Install QScintilla
        if: matrix.python-version == '3.9' && matrix.qt-binding == 'pyqt'
        run: |
          pip install Cython QScintilla
 - name: Install QScintilla (Qt5)
        if: matrix.python-version == '3.9' && matrix.qt-binding == 'pyqt' && matrix.qt-version== 5
        run: |
          pip install QScintilla
 - name: Install QScintilla (Qt6)
        if: matrix.python-version == '3.9' && matrix.qt-binding == 'pyqt' && matrix.qt-version== 6
        run: |
          pip install PyQt6-QScintilla
MatthieuDartiailh commented 2 years ago

Thanks. I will merge since otherwise the CIs won't kick in.

frmdstryr commented 2 years ago

Qt6 seems to run a bit smoother, at least on linux & wayland. Thanks for doing the updates!