Skip to content

Commit c428339

Browse files
committed
Fixes for CI system
Switch builds to PyQt6 Include resources folder in distribution Remove extra MANIFEST.in entries to silence warnings Pin PyQt6-Qt6 - https://github.com/googlefonts/fontra-pak/pull/27 Add pyqt6rc to test/build requirements
1 parent 1652b03 commit c428339

File tree

9 files changed

+53
-63
lines changed

9 files changed

+53
-63
lines changed

MANIFEST.in

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,5 @@ include test/*.py
2828
include test/gui_qt/*.py
2929
include tox.ini
3030
include windows/*
31-
# Exclude: CI/Git/GitHub specific files,
32-
# as well as generated Python files (UI).
33-
exclude .gitignore
34-
exclude plover/gui_qt/*_rc.py
31+
3532
exclude plover/gui_qt/*_ui.py
36-
exclude plover/gui_qt/.gitignore
37-
prune .github

linux/appimage/blacklist.txt

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,14 @@
3131
# Plover.
3232
:usr/lib/python${pyversion}/site-packages/plover
3333
gui_qt/*.ui
34-
gui_qt/resources
3534
messages/**/*.po
3635
messages/plover.pot
3736

38-
# PyQt5.
37+
# PyQt6.
3938
:usr/bin
40-
pylupdate5
41-
pyrcc5
42-
pyuic5
43-
:usr/lib/python${pyversion}/site-packages/PyQt5
39+
pylupdate6
40+
pyuic6
41+
:usr/lib/python${pyversion}/site-packages/PyQt6
4442
**/*Designer*
4543
**/*[Hh]elp*
4644
**/*[Qq]ml*
@@ -49,19 +47,18 @@
4947
**/*[Ww]ayland*
5048
**/*[Ww]eb[Ee]ngine*
5149
bindings
52-
Qt5/plugins/egldeviceintegrations
53-
Qt5/plugins/geoservices
54-
Qt5/plugins/platforms/libqeglfs.so
55-
Qt5/plugins/platforms/libqlinuxfb.so
56-
Qt5/plugins/platforms/libqminimal.so
57-
Qt5/plugins/platforms/libqminimalegl.so
58-
Qt5/plugins/platforms/libqoffscreen.so
59-
Qt5/plugins/platforms/libqvnc.so
60-
Qt5/plugins/platforms/libqwebgl.so
61-
Qt5/plugins/sceneparsers
62-
Qt5/plugins/webview
50+
Qt6/plugins/egldeviceintegrations
51+
Qt6/plugins/geoservices
52+
Qt6/plugins/platforms/libqeglfs.so
53+
Qt6/plugins/platforms/libqlinuxfb.so
54+
Qt6/plugins/platforms/libqminimal.so
55+
Qt6/plugins/platforms/libqminimalegl.so
56+
Qt6/plugins/platforms/libqoffscreen.so
57+
Qt6/plugins/platforms/libqvnc.so
58+
Qt6/plugins/platforms/libqwebgl.so
59+
Qt6/plugins/sceneparsers
60+
Qt6/plugins/webview
6361
pylupdate*
64-
pyrcc*
6562
uic
6663

6764
# vim: ft=config

osx/app_resources/dist_blacklist.txt

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
turtle*
2424
**/*.exe
2525
*/test*
26-
# PyQt5.
27-
:lib/python$python_base_version/site-packages/PyQt5
26+
# PyQt6.
27+
:lib/python$python_base_version/site-packages/PyQt6
2828
**/*AxContainer*
2929
**/*Bluetooth*
3030
**/*CLucene*
@@ -35,34 +35,32 @@
3535
**/*Serial*
3636
**/*Sql*
3737
**/*Test*
38-
Qt5/plugins/audio
39-
Qt5/plugins/bearer
40-
Qt5/plugins/generic
41-
Qt5/plugins/geoservices
42-
Qt5/plugins/mediaservice
43-
Qt5/plugins/playlistformats
44-
Qt5/plugins/position
45-
Qt5/plugins/printsupport
46-
Qt5/plugins/sceneparsers
47-
Qt5/plugins/sensor*
48-
Qt5/plugins/sqldrivers
49-
Qt5/qml
50-
Qt5/resources
51-
Qt5/translations/qt_help_*
52-
Qt5/translations/qtconnectivity_*
53-
Qt5/translations/qtdeclarative_*
54-
Qt5/translations/qtlocation_*
55-
Qt5/translations/qtmultimedia_*
56-
Qt5/translations/qtquick*
57-
Qt5/translations/qtserialport_*
58-
Qt5/translations/qtwebsockets_*
38+
Qt6/plugins/audio
39+
Qt6/plugins/bearer
40+
Qt6/plugins/generic
41+
Qt6/plugins/geoservices
42+
Qt6/plugins/mediaservice
43+
Qt6/plugins/playlistformats
44+
Qt6/plugins/position
45+
Qt6/plugins/printsupport
46+
Qt6/plugins/sceneparsers
47+
Qt6/plugins/sensor*
48+
Qt6/plugins/sqldrivers
49+
Qt6/qml
50+
Qt6/resources
51+
Qt6/translations/qt_help_*
52+
Qt6/translations/qtconnectivity_*
53+
Qt6/translations/qtdeclarative_*
54+
Qt6/translations/qtlocation_*
55+
Qt6/translations/qtmultimedia_*
56+
Qt6/translations/qtquick*
57+
Qt6/translations/qtserialport_*
58+
Qt6/translations/qtwebsockets_*
5959
pylupdate*
60-
pyrcc*
6160
uic
6261
# Plover.
6362
:lib/python$python_base_version/site-packages/plover
6463
gui_qt/*.ui
65-
gui_qt/resources
6664
messages/**/*.po
6765
messages/plover.pot
6866

plover_build_utils/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def _build_ui(self, src):
110110

111111
resources = {}
112112
resources_found = convert_tools.update_resources(src, resources)
113-
contents = convert_tools.ui_to_py(src)
113+
contents = os.popen(f"python -m PyQt6.uic.pyuic {src}").read()
114114
if resources_found is not None:
115115
contents = convert_tools.modify_py(contents, resources)
116116

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
requires = [
33
"Babel",
44
"PyQt6>=6.4.2",
5+
"pyqt6rc>=0.5.2",
56
"setuptools>=38.2.4",
67
"wheel",
78
]

reqs/constraints.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ pyobjc-framework-Cocoa==9.0
4545
pyobjc-framework-Quartz==9.0
4646
pyparsing==3.0.3
4747
PyQt6==6.4.2
48+
PyQt6-Qt6==6.4.3
4849
pyqt6rc==0.5.2
4950
pyserial==3.5
5051
pytest==6.2.5

reqs/dist_extra_gui_qt.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
PyQt6>=6.4
2+
pyqt6rc>=0.5.2
23

34
# vim: ft=cfg commentstring=#\ %s list

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ packages =
4040
plover.dictionary
4141
plover.gui_none
4242
plover.gui_qt
43+
plover.gui_qt.resources
4344
plover.machine
4445
plover.machine.keyboard_capture
4546
plover.macro
@@ -116,6 +117,5 @@ plover =
116117
messages/plover.pot
117118
plover.gui_qt =
118119
*.ui
119-
resources/*
120120

121121
# vim: commentstring=#\ %s list

windows/dist_blacklist.txt

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
# Python.
22
Scripts
3-
# PyQt5.
4-
:Lib/site-packages/PyQt5
3+
# PyQt6.
4+
:Lib/site-packages/PyQt6
55
**/*Designer*
66
**/*[Hh]elp*
77
**/*Test*
88
**/*Qml*
99
**/*[Qq]uick*
1010
**/*[Ww]eb[Ee]ngine*
1111
bindings
12-
Qt5/bin/libeay32.dll
13-
Qt5/bin/ssleay32.dll
14-
Qt5/plugins/platforms/qminimal.dll
15-
Qt5/plugins/platforms/qoffscreen.dll
16-
Qt5/plugins/platforms/qwebgl.dll
17-
Qt5/plugins/sceneparsers
18-
Qt5/qml
12+
Qt6/bin/libeay32.dll
13+
Qt6/bin/ssleay32.dll
14+
Qt6/plugins/platforms/qminimal.dll
15+
Qt6/plugins/platforms/qoffscreen.dll
16+
Qt6/plugins/platforms/qwebgl.dll
17+
Qt6/plugins/sceneparsers
18+
Qt6/qml
1919
pylupdate*
20-
pyrcc*
2120
uic
2221
# Plover.
2322
:Lib/site-packages/plover
2423
gui_qt/*.ui
25-
gui_qt/*.ui
26-
gui_qt/resources
2724
messages/**/*.po
2825
messages/plover.pot
2926

0 commit comments

Comments
 (0)